commit f91cd479e733171905239ece8ba866806468554a
author Samiul Islam <samiul@google.com> Mon Jan 30 13:26:24 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 30 13:26:24 2023 +0000
tree 3a2ba2c07691a2882aee264a7e18f2d8a1385a6b
parent dea4ecc800e3e88eb8c1fe0b17897c03223b56e6
parent 2aa93d92ac07d812d310f7fa1747f92b238bf8b1

Merge "Allow compatibility-device-util-axt to be used with ExtendedMockito"

common/device-side/util-axt/Android.bp

diff --git a/common/device-side/util-axt/Android.bp b/common/device-side/util-axt/Android.bp
index c998291..d07fe3d 100644
--- a/common/device-side/util-axt/Android.bp
+++ b/common/device-side/util-axt/Android.bp
@@ -16,8 +16,8 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-java_library_static {
-    name: "compatibility-device-util-axt",
+java_defaults {
+    name: "compatibility-device-util-axt-default",
     sdk_version: "test_current",
 
     srcs: [
@@ -31,7 +31,6 @@
         "androidx.test.rules",
         "androidx.test.ext.junit",
         "ub-uiautomator",
-        "mockito-target-minus-junit4",
         "androidx.annotation_annotation",
         "truth-prebuilt",
         "modules-utils-build_system",
@@ -45,6 +44,23 @@
     jarjar_rules: "protobuf-jarjar-rules.txt",
 }
 
+java_library_static {
+    name: "compatibility-device-util-axt",
+    defaults: ["compatibility-device-util-axt-default"],
+    static_libs: [
+        "mockito-target-minus-junit4",
+    ],
+}
+
+// This target can be used with ExtendedMockito
+java_library {
+    name: "compatibility-device-util-axt-minus-dexmaker",
+    defaults: ["compatibility-device-util-axt-default"],
+    static_libs: [
+        "mockito",
+    ],
+}
+
 filegroup {
     name: "compatibility-device-util-nodeps",
     srcs: [