summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-08-29 21:49:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-08-29 21:49:32 +0000
commit85b666c3b61fd9a64731b144f00abe91e19cfe54 (patch)
tree44df88538c2d197b14b10cf5cb90630864b97000
parent6b34ab3f1aafc3143c71e342b7a9f5a6ddfeabb4 (diff)
parentc2d6728350f3ec80f9b4c8967794558e42516987 (diff)
downloadbase-85b666c3b61fd9a64731b144f00abe91e19cfe54.tar.gz
Merge "Use core-tests-support instead of 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 22fa7fc0a456..be55444c63d6 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