Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace core-junit with junit" am: 6ac5293751

Browse Source 
am: a4d7100a3b

Change-Id: If81ca0656d26e2b0e05913c491615f769cb63b55
This commit is contained in:
Paul Duffin
2016-12-07 13:08:36 +00:00
committed by android-build-merger
parent 7549504970 a4d7100a3b
commit 9cb5f2815d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/uiautomator/library/Android.mk
View File

@@ -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 := \

2
test-runner/Android.mk
View File

@@ -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