summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-01 13:50:06 +0000
committerPaul Duffin <paulduffin@google.com>2016-12-06 14:32:41 +0000
commit9249205d1ba91065b7f314a05706d2b1011ee71b (patch)
treeb10abe2bd5bb692687d2ee8f3cdff46bb7ef1378
parent19fc36fa336c65405f88dbcef907ecc0feace7e7 (diff)
Replace core-junit with junit
Bug: 30188076 Test: make checkbuild Change-Id: I0cb6f89907eb099714b54bac57b51c4be186c3e0
-rw-r--r--cmds/uiautomator/library/Android.mk2
-rw-r--r--test-runner/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk
index d65b0833aafa..af2e25a99ad5 100644
--- a/cmds/uiautomator/library/Android.mk
+++ b/cmds/uiautomator/library/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir)
uiautomator.core_src_files := $(call all-java-files-under, core-src) \
$(call all-java-files-under, testrunner-src)
-uiautomator.core_java_libraries := android.test.runner core-junit
+uiautomator.core_java_libraries := android.test.runner junit
uiautomator_internal_api_file := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/uiautomator_api.txt
uiautomator_internal_removed_api_file := \
diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 68bde35d4ec5..a317994c41ba 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := core-oj core-libart core-junit framework
+LOCAL_JAVA_LIBRARIES := core-oj core-libart junit framework
LOCAL_STATIC_JAVA_LIBRARIES := junit-runner
LOCAL_MODULE:= android.test.runner