From 53e4ae92c759beab8d42bb9f462905d64a1411dc Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Tue, 19 Dec 2017 13:20:22 -0800 Subject: [PATCH] Don't include mockito in frameworks-base-testutils So that each test can pick if they want mockito-inline or not. Test: m -j checkbuild Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d Merged-In: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d --- core/tests/packagemanagertests/Android.mk | 3 ++- tests/utils/testutils/Android.mk | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/tests/packagemanagertests/Android.mk b/core/tests/packagemanagertests/Android.mk index c1e8c981579c0..5bfde78c424a1 100644 --- 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 diff --git a/tests/utils/testutils/Android.mk b/tests/utils/testutils/Android.mk index 43d1e37cafa35..700b7cb90c96f 100644 --- 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)