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

Commit 8aeb59eb authored Jan 10, 2017 by Paul Duffin

Prepare for removal of legacy-test from default targets

In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: I13e88297731253420e4e5f5291d503f13a39a156

parent 57b8eb3d

cmds/uiautomator/library/Android.mk

+2 −0

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

	###############################################		###############################################
	@@ -36,6 +37,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_SRC_FILES := $(uiautomator.core_src_files)		LOCAL_SRC_FILES := $(uiautomator.core_src_files)
	LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries)		LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries)
			LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
	LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \		LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \
	$(LOCAL_PATH)/testrunner-src		$(LOCAL_PATH)/testrunner-src

core/tests/ConnectivityManagerTest/Android.mk

+1 −0

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

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

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

core/tests/bandwidthtests/Android.mk

+1 −0

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

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

	include $(BUILD_PACKAGE)		include $(BUILD_PACKAGE)

core/tests/bluetoothtests/Android.mk

+1 −0

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

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

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

+1 −1

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

	LOCAL_SRC_FILES := $(call all-java-files-under, src)		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_JAVA_LIBRARIES := android.test.runner

	LOCAL_PACKAGE_NAME := DownloadManagerTestApp		LOCAL_PACKAGE_NAME := DownloadManagerTestApp