diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-07 13:24:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-07 13:24:14 +0000 |
| commit | 4a7cda98fca86d1a1b7df78d302e3caaf07137e1 (patch) | |
| tree | 8e1472c91e51ad75416c837dae34d299c4c6d14e | |
| parent | 6b87b3df2c5493cda939a1678ceabb49801120be (diff) | |
| parent | b6961ffa5396ad9965968095a37ddd21ed1e32b9 (diff) | |
Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b am: 9cb5f2815d
am: b6961ffa53
Change-Id: Id397baf01c8285b0843a66afd544ddf89abf451f
| -rw-r--r-- | cmds/uiautomator/library/Android.mk | 2 | ||||
| -rw-r--r-- | test-runner/Android.mk | 2 |
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 |