From 2e3e2955b8cf7ba181788140dd62b2dd20e7b600 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Thu, 11 May 2023 09:53:02 -0700 Subject: [PATCH] cronet: delete option to disable cronet in tm-mainline-prod With the release cut of the July train and the recent automerger cutover, tm-mainline-prod is now officially an abandoned branch. This change deletes (most) infrastructure that was put in place to disable cronet on tm-mainline-prod. Test: builds Change-Id: I078f2114b736a634f08d8f704c19beb2224ef645 --- Cronet/tests/common/Android.bp | 1 - Cronet/tests/cts/Android.bp | 32 ++---------------------- Cronet/tests/mts/Android.bp | 4 +-- Tethering/apex/Android.bp | 18 ------------- Tethering/common/TetheringLib/Android.bp | 29 --------------------- 5 files changed, 3 insertions(+), 81 deletions(-) diff --git a/Cronet/tests/common/Android.bp b/Cronet/tests/common/Android.bp index 5d2f6e595c..e17081a310 100644 --- a/Cronet/tests/common/Android.bp +++ b/Cronet/tests/common/Android.bp @@ -26,7 +26,6 @@ package { // go with merging NetHttp and Tethering targets. android_test { name: "NetHttpCoverageTests", - defaults: ["CronetTestJavaDefaults"], enforce_default_target_sdk_version: true, min_sdk_version: "30", test_suites: ["general-tests", "mts-tethering"], diff --git a/Cronet/tests/cts/Android.bp b/Cronet/tests/cts/Android.bp index 22eccf99fc..44b3364f33 100644 --- a/Cronet/tests/cts/Android.bp +++ b/Cronet/tests/cts/Android.bp @@ -18,38 +18,10 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -// cronet_test_java_defaults can be used to specify a java_defaults target that -// either enables or disables Cronet tests. This is used to disable Cronet -// tests on tm-mainline-prod where the required APIs are not present. -cronet_test_java_defaults = "CronetTestJavaDefaultsEnabled" -// This is a placeholder comment to avoid merge conflicts -// as cronet_test_java_defaults may have different values -// depending on the branch - -java_defaults { - name: "CronetTestJavaDefaultsEnabled", - enabled: true, - // TODO(danstahr): move to unconditional static_libs once the T branch is abandoned - static_libs: [ - "truth", - ], -} - -java_defaults { - name: "CronetTestJavaDefaultsDisabled", - enabled: false, -} - -java_defaults { - name: "CronetTestJavaDefaults", - defaults: [cronet_test_java_defaults], -} - android_library { name: "CtsNetHttpTestsLib", defaults: [ "cts_defaults", - "CronetTestJavaDefaults", ], sdk_version: "test_current", min_sdk_version: "30", @@ -61,10 +33,11 @@ android_library { "androidx.test.ext.junit", "ctstestrunner-axt", "ctstestserver", - "junit", "hamcrest-library", + "junit", "kotlin-test", "mockito-target", + "truth", ], libs: [ "android.test.base", @@ -79,7 +52,6 @@ android_test { name: "CtsNetHttpTestCases", defaults: [ "cts_defaults", - "CronetTestJavaDefaults", ], sdk_version: "test_current", static_libs: ["CtsNetHttpTestsLib"], diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp index ecf4b7fc41..93564e48ed 100644 --- a/Cronet/tests/mts/Android.bp +++ b/Cronet/tests/mts/Android.bp @@ -19,7 +19,6 @@ package { java_genrule { name: "net-http-test-jarjar-rules", - defaults: ["CronetTestJavaDefaults"], tool_files: [ ":NetHttpTestsLibPreJarJar{.jar}", "jarjar_excludes.txt", @@ -37,7 +36,6 @@ java_genrule { android_library { name: "NetHttpTestsLibPreJarJar", - defaults: ["CronetTestJavaDefaults"], srcs: [":cronet_aml_javatests_sources"], sdk_version: "module_current", min_sdk_version: "30", @@ -46,6 +44,7 @@ android_library { "androidx.test.ext.junit", "androidx.test.rules", "junit", + "truth", ], libs: [ "android.test.base", @@ -59,7 +58,6 @@ android_library { android_test { name: "NetHttpTests", defaults: [ - "CronetTestJavaDefaults", "mts-target-sdk-version-current", ], static_libs: ["NetHttpTestsLibPreJarJar"], diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp index d84fef3c2d..89511a71b7 100644 --- a/Tethering/apex/Android.bp +++ b/Tethering/apex/Android.bp @@ -57,22 +57,8 @@ enable_tethering_next_apex = true // as the above target may have different "enabled" values // depending on the branch -// cronet_in_tethering_apex_defaults can be used to specify an apex_defaults target that either -// enables or disables inclusion of Cronet in the Tethering apex. This is used to disable Cronet -// on tm-mainline-prod. Note: in order for Cronet APIs to work Cronet must also be enabled -// by the cronet_java_*_defaults in common/TetheringLib/Android.bp. -cronet_in_tethering_apex_defaults = "CronetInTetheringApexDefaultsEnabled" -// This is a placeholder comment to avoid merge conflicts -// as cronet_apex_defaults may have different values -// depending on the branch - apex_defaults { name: "CronetInTetheringApexDefaults", - defaults: [cronet_in_tethering_apex_defaults], -} - -apex_defaults { - name: "CronetInTetheringApexDefaultsEnabled", jni_libs: [ "cronet_aml_components_cronet_android_cronet", "//external/cronet/third_party/boringssl:libcrypto", @@ -90,10 +76,6 @@ apex_defaults { }, } -apex_defaults { - name: "CronetInTetheringApexDefaultsDisabled", -} - apex { name: "com.android.tethering", defaults: [ diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index 6b62da9473..a957e23bc2 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp @@ -17,16 +17,6 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -// Both cronet_java_defaults and cronet_java_prejarjar_defaults can be used to -// specify a java_defaults target that either enables or disables Cronet. This -// is used to disable Cronet on tm-mainline-prod. -// Note: they must either both be enabled or disabled. -cronet_java_defaults = "CronetJavaDefaultsEnabled" -cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsEnabled" -// This is a placeholder comment to avoid merge conflicts -// as cronet_defaults may have different values -// depending on the branch - java_sdk_library { name: "framework-tethering", defaults: [ @@ -69,11 +59,6 @@ java_sdk_library { java_defaults { name: "CronetJavaDefaults", - defaults: [cronet_java_defaults], -} - -java_defaults { - name: "CronetJavaDefaultsEnabled", srcs: [":cronet_aml_api_sources"], libs: [ "androidx.annotation_annotation", @@ -83,22 +68,8 @@ java_defaults { ], } -java_defaults { - name: "CronetJavaDefaultsDisabled", - api_dir: "cronet_disabled/api", -} - java_defaults { name: "CronetJavaPrejarjarDefaults", - defaults: [cronet_java_prejarjar_defaults], -} - -java_defaults { - name: "CronetJavaPrejarjarDefaultsDisabled", -} - -java_defaults { - name: "CronetJavaPrejarjarDefaultsEnabled", static_libs: [ "cronet_aml_api_java", "cronet_aml_java"