Allow compatibility-device-util-axt to be used with ExtendedMockito
A new target is created that does not depend on dexmaker. The new target
still needs to depend on "mockito" so that it can be built. The user of
the new target can either use "mockito-target-minus-junit4" or
"mockito-target-extended-minus-junit4" and it should work for both
dependencies.
Bug: 265378635
Test: atest SdkSandboxFrameworkUnitTests
Change-Id: Iafa7fc23681a251adc17d21057908d8f0ca6f75d
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: [
