Merge "Don't include mockito in frameworks-base-testutils"

2017-12-20 18:55:14 +00:00
parent 4edb4c8ec4 53e4ae92c7
commit f924642729
2 changed files with 6 additions and 4 deletions
--- a/core/tests/packagemanagertests/Android.mk
+++ b/core/tests/packagemanagertests/Android.mk
@@ -10,7 +10,8 @@ LOCAL_SRC_FILES := \

 LOCAL_STATIC_JAVA_LIBRARIES := \
    android-support-test \
-    frameworks-base-testutils
+    frameworks-base-testutils \
+    mockito-target-minus-junit4

 LOCAL_JAVA_LIBRARIES := android.test.runner
 LOCAL_PACKAGE_NAME := FrameworksCorePackageManagerTests
--- a/tests/utils/testutils/Android.mk
+++ b/tests/utils/testutils/Android.mk
@@ -25,9 +25,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java)

 LOCAL_STATIC_JAVA_LIBRARIES := \
    android-support-test \
-    legacy-android-test \
+    legacy-android-test
+
+LOCAL_JAVA_LIBRARIES := \
+    android.test.runner \
    mockito-target-minus-junit4

-LOCAL_JAVA_LIBRARIES := android.test.runner
-
 include $(BUILD_STATIC_JAVA_LIBRARY)