summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-08-30 23:21:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-30 23:21:27 +0000
commit580e60fdcd64ba1c8cd6bad3d20200312b7503aa (patch)
tree2f93dcead3d09a90755879e71f4635de142e1b5a /core/tests
parent9d7c4d4a6e4683862931b3a11c974715073514ab (diff)
parent3603f04ab8b828a8fc990e21ad459f7a38775941 (diff)
downloadframeworks_base-580e60fdcd64ba1c8cd6bad3d20200312b7503aa.zip
frameworks_base-580e60fdcd64ba1c8cd6bad3d20200312b7503aa.tar.gz
frameworks_base-580e60fdcd64ba1c8cd6bad3d20200312b7503aa.tar.bz2
Merge "Use core-tests-support instead of core-tests" into klp-dev
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/coretests/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk
index 22fa7fc..be55444 100644
--- a/core/tests/coretests/Android.mk
+++ b/core/tests/coretests/Android.mk
@@ -22,7 +22,7 @@ LOCAL_SRC_FILES := \
$(call all-java-files-under, EnabledTestApp/src)
LOCAL_DX_FLAGS := --core-library
-LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-common frameworks-core-util-lib mockwebserver guava littlemock
+LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support android-common frameworks-core-util-lib mockwebserver guava littlemock
LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common
LOCAL_PACKAGE_NAME := FrameworksCoreTests