From a523f7d3d3acda9521a0f329896e8a2d2000e91a Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Tue, 28 Sep 2021 10:01:50 -0700 Subject: [PATCH] Exclude androidx.test:annotation classes from rules, monitor and runner. PiperOrigin-RevId: 399465508 --- runner/android_junit_runner/java/androidx/test/BUILD.bazel | 1 + runner/monitor/java/androidx/test/BUILD.bazel | 3 +++ runner/rules/java/androidx/test/BUILD.bazel | 1 + 3 files changed, 5 insertions(+) diff --git a/runner/android_junit_runner/java/androidx/test/BUILD.bazel b/runner/android_junit_runner/java/androidx/test/BUILD.bazel index 3756384ed..18e76ec9e 100644 --- a/runner/android_junit_runner/java/androidx/test/BUILD.bazel +++ b/runner/android_junit_runner/java/androidx/test/BUILD.bazel @@ -53,6 +53,7 @@ axt_release_lib( jarjar_rules = "release_jarjar_rules.txt", keep_spec = "androidx/test", overlapping_jars = [ + "//annotation/java/androidx/test/annotation:annotation_release_no_deps.jar", "//runner/monitor/java/androidx/test:monitor_release_no_deps.jar", "//services/storage/java/androidx/test/services/storage:test_storage_release_no_deps.jar", ], diff --git a/runner/monitor/java/androidx/test/BUILD.bazel b/runner/monitor/java/androidx/test/BUILD.bazel index 67660ed69..16c86fa6b 100644 --- a/runner/monitor/java/androidx/test/BUILD.bazel +++ b/runner/monitor/java/androidx/test/BUILD.bazel @@ -57,6 +57,9 @@ axt_release_lib( custom_package = "androidx.test.monitor", jarjar_rules = "release_jarjar_rules.txt", keep_spec = "androidx/test", + overlapping_jars = [ + "//annotation/java/androidx/test/annotation:annotation_release_no_deps.jar", + ], proguard_library = ":proguard_library.cfg", # remove the generated R class remove_spec = "androidx/test/monitor/R[$$\\.]", diff --git a/runner/rules/java/androidx/test/BUILD.bazel b/runner/rules/java/androidx/test/BUILD.bazel index a55a2919f..7e8de1ea3 100644 --- a/runner/rules/java/androidx/test/BUILD.bazel +++ b/runner/rules/java/androidx/test/BUILD.bazel @@ -35,6 +35,7 @@ axt_release_lib( custom_package = "androidx.test.rules", keep_spec = "androidx/test", overlapping_jars = [ + "//annotation/java/androidx/test/annotation:annotation_release_no_deps.jar", "//runner/android_junit_runner/java/androidx/test:runner_release_no_deps.jar", "//runner/monitor/java/androidx/test:monitor_release_no_deps.jar", "//services/storage/java/androidx/test/services/storage:test_storage_release_no_deps.jar",