Merge "Fix test broken by 1454294" into nyc-andromeda-dev (eea1434b) · Commits · e / os / android_packages_apps_DocumentsUI

tests/Android.mk

+4 −14

Original line number	Diff line number	Diff line
		@@ -5,23 +5,13 @@ include $(CLEAR_VARS)

		# unittests
		LOCAL_MODULE_TAGS := tests
		LOCAL_SRC_FILES := $(call all-java-files-under, common, unit)
		LOCAL_SRC_FILES := $(call all-java-files-under, common) \
		$(call all-java-files-under, unit) \
		$(call all-java-files-under, functional)
		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator espresso-core guava
		LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
		LOCAL_PACKAGE_NAME := DocumentsUIUnitTests
		LOCAL_INSTRUMENTATION_FOR := DocumentsUI
		LOCAL_CERTIFICATE := platform

		include $(CLEAR_VARS)

		# functional tests
		LOCAL_MODULE_TAGS := tests
		LOCAL_SRC_FILES := $(call all-java-files-under, common, functional)
		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator espresso-core guava
		LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
		LOCAL_PACKAGE_NAME := DocumentsUIFunctionalTests
		LOCAL_PACKAGE_NAME := DocumentsUITests
		LOCAL_INSTRUMENTATION_FOR := DocumentsUI
		LOCAL_CERTIFICATE := platform

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,11 +14,12 @@
		* limitations under the License.
		*/

		package com.android.documentsui.functional;
		package com.android.documentsui;

		import android.graphics.Point;
		import android.graphics.Rect;
		import android.test.suitebuilder.annotation.LargeTest;

		import com.android.documentsui.manager.ManageActivity;

		@LargeTest

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,9 +14,10 @@
		* limitations under the License.
		*/

		package com.android.documentsui.functional;
		package com.android.documentsui;

		import android.test.suitebuilder.annotation.LargeTest;

		import com.android.documentsui.manager.ManageActivity;

		@LargeTest