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

Commit 43267b4b authored Jan 19, 2017 by Paul Duffin Committed by android-build-merger Jan 19, 2017

Merge "Prepare for removal of legacy-test from default targets" am: c74ccf15 am: ab62fd67

am: 56a2ae10

Change-Id: I0ede6895eb25f72a74af3ac4431a21960500bec5

parents e344c673 56a2ae10

cmds/uiautomator/library/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ include $(CLEAR_VARS)
		LOCAL_SRC_FILES := $(uiautomator.core_src_files)
		LOCAL_MODULE := uiautomator.core
		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
		include $(BUILD_STATIC_JAVA_LIBRARY)

		###############################################

core/tests/ConnectivityManagerTest/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_TAGS := tests

		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test

		# Include all test java files.
		LOCAL_SRC_FILES := $(call all-java-files-under, src)

core/tests/bandwidthtests/Android.mk

+1 −0

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

		LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy
		LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
		LOCAL_PACKAGE_NAME := BandwidthTests

		include $(BUILD_PACKAGE)

core/tests/bluetoothtests/Android.mk

+1 −0

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

		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
		LOCAL_PACKAGE_NAME := BluetoothTests
		LOCAL_CERTIFICATE := platform

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

+1 −1

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

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

		LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver
		LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver junit legacy-android-test
		LOCAL_JAVA_LIBRARIES := android.test.runner

		LOCAL_PACKAGE_NAME := DownloadManagerTestApp