Exclude androidx.test:annotation classes from rules, monitor and runner.

PiperOrigin-RevId: 399465508
android · Sep 28, 2021 · a523f7d · a523f7d
1 parent b3ebb9c
commit a523f7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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",