Merge "cronet: add variable to disable cronet tests on tm-mainline-prod" am: 3d5efcb7e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2392952
Change-Id: I80ebd56dd346755f870c49642dad0ec5e32b8339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Cronet/tests/cts/Android.bp b/Cronet/tests/cts/Android.bp
index d10c68c..22c4b0e 100644
--- a/Cronet/tests/cts/Android.bp
+++ b/Cronet/tests/cts/Android.bp
@@ -18,6 +18,14 @@
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
+
android_test {
name: "CtsCronetTestCases",
compile_multilib: "both", // Include both the 32 and 64 bit versions