commit b6961ffa5396ad9965968095a37ddd21ed1e32b9
author Paul Duffin <paulduffin@google.com> Wed Dec 07 13:16:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 07 13:16:12 2016 +0000
tree 7ff04ae18c42df8260a195a6718f18a3030439d6
parent cc8bbffbd6317d53bc0215571af278e3abe8fb7e
parent 9cb5f2815dae97560ab10ad19da65db5d35cc237

Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b
am: 9cb5f2815d

Change-Id: Ic5d35084e11387696997082f9c83ef25f543590b

cmds/uiautomator/library/Android.mk

diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk
index d65b0833..af2e25a 100644
--- a/cmds/uiautomator/library/Android.mk
+++ b/cmds/uiautomator/library/Android.mk
@@ -18,7 +18,7 @@
 
 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 := \

test-runner/Android.mk

diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 68bde35..a317994 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -20,7 +20,7 @@
 
 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