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

Commit 913794b0 authored Mar 06, 2016 by Guang Zhu Committed by Android (Google) Code Review Mar 06, 2016

Merge "fix DocumentsUI tests makefile" into nyc-dev

parents b94f2df2 c5a511ad

packages/DocumentsUI/perf-tests/Android.mk

+2 −2

Original line number	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/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

packages/DocumentsUI/tests/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -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