From c5a511ad0cac3a1370c30a73ca2ad518a0ae677b Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Sat, 5 Mar 2016 15:46:46 -0800 Subject: [PATCH] fix DocumentsUI tests makefile For instrumentation test apks, it should not statically include Java libraries that are already present in the app module being instrumented. They only need to be on classpath during compile time. Bug: 26689464 Change-Id: I68d4be95e30ae70bbab23d016a87eb085c10cc50 --- packages/DocumentsUI/perf-tests/Android.mk | 4 ++-- packages/DocumentsUI/tests/Android.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/DocumentsUI/perf-tests/Android.mk b/packages/DocumentsUI/perf-tests/Android.mk index c83094e352b67..11c163bdfbcdd 100644 --- a/packages/DocumentsUI/perf-tests/Android.mk +++ b/packages/DocumentsUI/perf-tests/Android.mk @@ -10,8 +10,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ ../tests/src/com/android/documentsui/DocumentsProviderHelper.java \ ../tests/src/com/android/documentsui/StubProvider.java -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 mockito-target ub-uiautomator +LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator LOCAL_PACKAGE_NAME := DocumentsUIPerfTests LOCAL_INSTRUMENTATION_FOR := DocumentsUI diff --git a/packages/DocumentsUI/tests/Android.mk b/packages/DocumentsUI/tests/Android.mk index b65ac98d01933..3983f780ad627 100644 --- a/packages/DocumentsUI/tests/Android.mk +++ b/packages/DocumentsUI/tests/Android.mk @@ -7,8 +7,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 mockito-target ub-uiautomator +LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator LOCAL_PACKAGE_NAME := DocumentsUITests LOCAL_INSTRUMENTATION_FOR := DocumentsUI