summaryrefslogtreecommitdiff
path: root/cmds/uiautomator
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-01-19 16:47:45 +0000
committerPaul Duffin <paulduffin@google.com>2017-01-20 09:00:33 +0000
commit1d0244a846e1a12198a12c685048103a026f902d (patch)
tree175a00c667a3d7662d1b99219e2b43de7a251116 /cmds/uiautomator
parent3074c5ade869dde5b65676bccdfe0f2a3769f013 (diff)
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: If507b641624a2933e722f61e815890fcdf442265
Diffstat (limited to 'cmds/uiautomator')
-rw-r--r--cmds/uiautomator/library/Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk
index de46b8c21259..f932388b0617 100644
--- a/cmds/uiautomator/library/Android.mk
+++ b/cmds/uiautomator/library/Android.mk
@@ -36,8 +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_STATIC_JAVA_LIBRARIES := legacy-android-test
+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