diff options
Diffstat (limited to 'chromium/components/cronet')
| -rw-r--r-- | chromium/components/cronet/BUILD.gn | 3 | ||||
| -rw-r--r-- | chromium/components/cronet/android/BUILD.gn | 85 |
2 files changed, 51 insertions, 37 deletions
diff --git a/chromium/components/cronet/BUILD.gn b/chromium/components/cronet/BUILD.gn index 8c42444bd41..7fa6eb50aa1 100644 --- a/chromium/components/cronet/BUILD.gn +++ b/chromium/components/cronet/BUILD.gn @@ -6,7 +6,7 @@ import("//build/buildflag_header.gni") import("//build/toolchain/toolchain.gni") import("//build/util/lastchange.gni") import("//build/util/process_version.gni") -import("//build/util/version.gni") +import("//chrome/version.gni") import("//components/cronet/native/include/headers.gni") import("//components/grpc_support/include/headers.gni") import("//testing/test.gni") @@ -59,7 +59,6 @@ source_set("cronet_common") { "//base", "//components/prefs:prefs", "//net", - "//third_party/metrics_proto", ] if (!disable_histogram_support) { diff --git a/chromium/components/cronet/android/BUILD.gn b/chromium/components/cronet/android/BUILD.gn index 31de1a5155e..d01b778aae3 100644 --- a/chromium/components/cronet/android/BUILD.gn +++ b/chromium/components/cronet/android/BUILD.gn @@ -9,7 +9,7 @@ import("//build/config/android/rules.gni") import("//build/config/zip.gni") import("//build/util/lastchange.gni") import("//build/util/process_version.gni") -import("//build/util/version.gni") +import("//chrome/version.gni") import("//components/cronet/native/include/headers.gni") import("//components/grpc_support/include/headers.gni") import("//testing/test.gni") @@ -47,6 +47,9 @@ generate_jni("cronet_jni_headers") { generate_jni_registration("cronet_jni_registration") { targets = [ ":cronet_impl_native_base_java" ] header_output = _jni_registration_header + + # JNI generated is used for test and non-test apks. + include_testonly = true sources_exclusions = [ "//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "//base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", @@ -144,7 +147,6 @@ source_set("cronet_static") { "//components/cronet:cronet_version_header", "//components/cronet:metrics_util", "//components/cronet/native:cronet_native_impl", - "//components/metrics", "//components/prefs", "//net", "//third_party/zlib:zlib", @@ -276,6 +278,7 @@ android_library("cronet_impl_common_base_java") { "java/src/org/chromium/net/impl/CronetExceptionImpl.java", "java/src/org/chromium/net/impl/CronetLogger.java", "java/src/org/chromium/net/impl/CronetLoggerFactory.java", + "java/src/org/chromium/net/impl/CronetManifest.java", "java/src/org/chromium/net/impl/NetworkExceptionImpl.java", "java/src/org/chromium/net/impl/NoOpLogger.java", "java/src/org/chromium/net/impl/Preconditions.java", @@ -354,22 +357,6 @@ android_library("cronet_impl_fake_base_java") { ] } -cronet_impl_native_java_srcjar_deps = [ - ":net_idempotency_java", - ":net_request_priority_java", - ":network_quality_observation_source_java", - ":url_request_error_java", -] - -cronet_impl_native_java_deps_to_package = [ - ":cronet_urlconnection_impl_java", - "//base:base_java", - "//base:jni_java", - "//build/android:build_java", - "//net/android:net_java", - "//url:url_java", -] - android_library("cronet_urlconnection_impl_java") { sources = [ "java/src/org/chromium/net/urlconnection/CronetBufferedOutputStream.java", @@ -388,6 +375,22 @@ android_library("cronet_urlconnection_impl_java") { ] } +cronet_impl_native_java_srcjar_deps = [ + ":net_idempotency_java", + ":net_request_priority_java", + ":network_quality_observation_source_java", + ":url_request_error_java", +] + +cronet_impl_native_java_deps_to_package = [ + ":cronet_urlconnection_impl_java", + "//base:base_java", + "//base:jni_java", + "//build/android:build_java", + "//net/android:net_java", + "//url:url_java", +] + # cronet_impl_native_base_java.jar - native implementation of the Cronet engine. android_library("cronet_impl_native_base_java") { sources = [ @@ -688,7 +691,7 @@ _jar_excluded_patterns = [ "*/multidex/*.class", "*/process_launcher/*.class", "*/SysUtils*.class", - "org/chromium/base/FeatureList*.class", + "org/chromium/base/Feature*.class", "org/chromium/base/jank_tracker/*.class", "org/chromium/base/memory/MemoryPressureMonitor*.class", ] @@ -792,6 +795,7 @@ if (!is_component_build) { sources = [ "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java" ] deps = [ ":cronet_sample_apk_java", + ":package_impl_common_java", "//third_party/android_deps:espresso_java", "//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:runner_java", @@ -926,6 +930,7 @@ if (!is_component_build) { android_library("cronet_common_javatests") { testonly = true sources = [ + "test/javatests/src/org/chromium/net/CronetLoggerTestRule.java", "test/javatests/src/org/chromium/net/CronetTestRule.java", "test/javatests/src/org/chromium/net/TestUploadDataProvider.java", "test/javatests/src/org/chromium/net/TestUrlRequestCallback.java", @@ -938,6 +943,7 @@ if (!is_component_build) { "//build/android:build_java", "//third_party/android_sdk:android_test_base_java", "//third_party/android_support_test_runner:runner_java", + "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/junit", ] } @@ -1015,6 +1021,7 @@ if (!is_component_build) { "test/javatests/src/org/chromium/net/UploadDataProvidersTest.java", "test/javatests/src/org/chromium/net/UrlResponseInfoTest.java", "test/javatests/src/org/chromium/net/impl/CronetLoggerTest.java", + "test/javatests/src/org/chromium/net/impl/CronetManifestTest.java", "test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java", "test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java", "test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java", @@ -1049,6 +1056,7 @@ if (!is_component_build) { # This is the only Cronet APK with lint enabled. This one was chosen because # it depends on basically all source files. enable_lint = true + lint_baseline_file = "lint-baseline.xml" lint_suppressions_file = "lint-suppressions.xml" # Still needs to support KitKat. See crbug.com/1042122. @@ -1121,8 +1129,8 @@ if (!is_component_build) { android_manifest = "test/javatests/AndroidManifest.xml" sources = cronet_smoketests_platform_only_common_srcs + [ - "test/src/org/chromium/net/CronetTestApplication.java", "test/smoketests/src/org/chromium/net/smoke/PlatformOnlyEngineTest.java", + "test/src/org/chromium/net/CronetTestApplication.java", ] deps = [ @@ -1235,7 +1243,6 @@ if (!is_component_build) { "//base/test:test_support", "//components/cronet:cronet_common_unittests", "//components/cronet/native:cronet_native_unittests", - "//components/metrics", "//components/prefs:test_support", "//net", "//net:test_support", @@ -1259,7 +1266,6 @@ if (!is_component_build) { "//base", "//base/test:test_support", "//components/cronet/native/test:cronet_native_tests", - "//components/metrics", "//components/prefs:test_support", "//net", "//net:test_support", @@ -1355,14 +1361,27 @@ if (!is_component_build) { depfile = "$target_gen_dir/$target_name.d" _zip_file = "$target_gen_dir/$target_name.zip" outputs = [ _zip_file ] - _annotations_jar = "$root_out_dir/lib.java/third_party/androidx/androidx_annotation_annotation.jar" _src_jar = "$_package_dir/cronet_api-src.jar" + + _annotations_dep = + "//third_party/androidx:androidx_annotation_annotation_java" + _build_config_dep = "$_annotations_dep$build_config_target_suffix" + _build_config = + get_label_info(_annotations_dep, "target_gen_dir") + "/" + + get_label_info(_annotations_dep, "name") + ".build_config.json" + + deps = [ + ":jar_cronet_api_source", + _annotations_dep, + _build_config_dep, + ] inputs = [ - _annotations_jar, _src_jar, android_sdk_jar, + _build_config, ] + _rebased_build_config = rebase_path(_build_config, root_build_dir) args = [ "--output-dir", rebase_path(_package_dir, root_build_dir), @@ -1378,17 +1397,13 @@ if (!is_component_build) { rebase_path(_zip_file, root_build_dir), "--android-sdk-jar", rebase_path(android_sdk_jar, root_build_dir), - "--support-annotations-jar", - rebase_path(_annotations_jar, root_build_dir), + "--support-annotations-jar=@FileArg($_rebased_build_config:deps_info:unprocessed_jar_path)", + "--classpath-jars=@FileArg($_rebased_build_config:deps_info:javac_full_classpath)", # JavaDoc is generated from Cronet's API source jar. "--input-src-jar", rebase_path(_src_jar, root_build_dir), ] - deps = [ - ":jar_cronet_api_source", - "//third_party/androidx:androidx_annotation_annotation_java", - ] } copy("cronet_package_copy") { @@ -1524,11 +1539,11 @@ if (!is_component_build) { action("api_static_checks") { script = "//components/cronet/tools/api_static_checks.py" outputs = [ "$target_gen_dir/$target_name.stamp" ] - _api_jar = - "$root_build_dir/lib.java/components/cronet/android/cronet_api_java.jar" - _common_jar = "$root_build_dir/lib.java/components/cronet/android/cronet_impl_common_base_java.jar" - _platform_jar = "$root_build_dir/lib.java/components/cronet/android/cronet_impl_platform_base_java.jar" - _native_jar = "$root_build_dir/lib.java/components/cronet/android/cronet_impl_native_base_java.jar" + _api_jar = "$target_out_dir/cronet_api_java.processed.jar" + _common_jar = "$target_out_dir/cronet_impl_common_base_java.processed.jar" + _platform_jar = + "$target_out_dir/cronet_impl_platform_base_java.processed.jar" + _native_jar = "$target_out_dir/cronet_impl_native_base_java.processed.jar" args = [ "--api_jar", rebase_path(_api_jar, root_build_dir), |