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

Commit 1250371b authored Jan 17, 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: I5d2c0685b74ea5ba368c777d9646b9d3ac24dca9

parent 8b5c1f48

tests/app/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		espresso-core \
		espresso-contrib-nodep \
		espresso-intents-nodep \
		ub-uiautomator
		ub-uiautomator \
		legacy-android-test

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

tests/unit/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-test \
		mockito-target-minus-junit4 \
		espresso-core \
		truth-prebuilt
		truth-prebuilt \
		legacy-android-test

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