Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c998623 authored Mar 05, 2016 by Guang Zhu

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

parent f4627dd9

perf-tests/Android.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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/DocumentsProviderHelper.java \
	../tests/src/com/android/documentsui/StubProvider.java		../tests/src/com/android/documentsui/StubProvider.java

	LOCAL_JAVA_LIBRARIES := android.test.runner		LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
	LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 mockito-target ub-uiautomator		LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator

	LOCAL_PACKAGE_NAME := DocumentsUIPerfTests		LOCAL_PACKAGE_NAME := DocumentsUIPerfTests
	LOCAL_INSTRUMENTATION_FOR := DocumentsUI		LOCAL_INSTRUMENTATION_FOR := DocumentsUI

tests/Android.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7,8 +7,8 @@ LOCAL_MODULE_TAGS := tests

	LOCAL_SRC_FILES := $(call all-java-files-under, src)		LOCAL_SRC_FILES := $(call all-java-files-under, src)

	LOCAL_JAVA_LIBRARIES := android.test.runner		LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
	LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 mockito-target ub-uiautomator		LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator

	LOCAL_PACKAGE_NAME := DocumentsUITests		LOCAL_PACKAGE_NAME := DocumentsUITests
	LOCAL_INSTRUMENTATION_FOR := DocumentsUI		LOCAL_INSTRUMENTATION_FOR := DocumentsUI