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

Commit cc1b3e0e authored Dec 15, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Dec 15, 2017

Merge "Add android.test.base/stubs dependency"

parents 41b745ca e451de10

cmds/uiautomator/instrumentation/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_TAGS := tests
		LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \
		$(call all-java-files-under, ../library/core-src)
		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
		LOCAL_STATIC_JAVA_LIBRARIES := junit
		LOCAL_MODULE := uiautomator-instrumentation
		# TODO: change this to 18 when it's available

core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_STATIC_JAVA_LIBRARIES := junit

		LOCAL_JAVA_LIBRARIES := android.test.base.stubs

		LOCAL_SDK_VERSION := current

		LOCAL_PACKAGE_NAME := ExternalSharedPermsTestApp

core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_STATIC_JAVA_LIBRARIES := junit

		LOCAL_JAVA_LIBRARIES := android.test.base.stubs

		LOCAL_SDK_VERSION := current

		LOCAL_PACKAGE_NAME := ExternalSharedPermsBTTestApp

core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_STATIC_JAVA_LIBRARIES := junit

		LOCAL_JAVA_LIBRARIES := android.test.base.stubs

		LOCAL_SDK_VERSION := current

		LOCAL_PACKAGE_NAME := ExternalSharedPermsDiffKeyTestApp

core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_STATIC_JAVA_LIBRARIES := junit

		LOCAL_JAVA_LIBRARIES := android.test.base.stubs

		LOCAL_SDK_VERSION := current

		LOCAL_PACKAGE_NAME := ExternalSharedPermsFLTestApp