diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-01-10 12:08:23 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-01-18 16:39:34 +0000 |
| commit | 8aeb59ebcd50a510d024dc082fa17b192074c63d (patch) | |
| tree | b7f3e92f4eebc63df03fd63d35b0eafc18ccc81c /cmds/uiautomator | |
| parent | 57b8eb3da0c4692ac4f39a9c73aa090af475d14a (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: I13e88297731253420e4e5f5291d503f13a39a156
Diffstat (limited to 'cmds/uiautomator')
| -rw-r--r-- | cmds/uiautomator/library/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk index af2e25a99ad5..de46b8c21259 100644 --- a/cmds/uiautomator/library/Android.mk +++ b/cmds/uiautomator/library/Android.mk @@ -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) ############################################### @@ -36,6 +37,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 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_MODULE_CLASS := JAVA_LIBRARIES LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \ $(LOCAL_PATH)/testrunner-src |