From 4190f233f9f4f75f80ba7d1afa869a12b7af8094 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 24 Jan 2017 14:28:20 +0000 Subject: [PATCH] Prepare for removal of legacy-test from default targets (Part 2) 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 Merged-In: If507b641624a2933e722f61e815890fcdf442265 Change-Id: Icdcad50f1cc32e900bc9e882f1db2867ea170fbf --- cmds/uiautomator/library/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk index 9017be2d047ca..f932388b0617e 100644 --- a/cmds/uiautomator/library/Android.mk +++ b/cmds/uiautomator/library/Android.mk @@ -36,7 +36,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # Generate the stub source files include $(CLEAR_VARS) LOCAL_SRC_FILES := $(uiautomator.core_src_files) -LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries) +LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries) legacy-android-test LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \ $(LOCAL_PATH)/testrunner-src