summaryrefslogtreecommitdiffstats
path: root/jack/Android.mk
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2014-10-27 16:48:28 +0100
committerYohann Roussel <yroussel@google.com>2014-10-27 16:48:28 +0100
commite1814aaa3b489ec73862135f7ce150c5b1721926 (patch)
treea3de3cbabf2d6fd878dad1382bf8e71ad17d7a6a /jack/Android.mk
parente1e5169445cfd3c3468a6bdef427725edea8a5a5 (diff)
downloadtoolchain_jack-e1814aaa3b489ec73862135f7ce150c5b1721926.zip
toolchain_jack-e1814aaa3b489ec73862135f7ce150c5b1721926.tar.gz
toolchain_jack-e1814aaa3b489ec73862135f7ce150c5b1721926.tar.bz2
Adapt mm test-jack-long to lmp-mr1
Change-Id: I3c054e5091779827863ac625a99230ba2987f47d
Diffstat (limited to 'jack/Android.mk')
-rw-r--r--jack/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/jack/Android.mk b/jack/Android.mk
index 3cc620e..82a6aab 100644
--- a/jack/Android.mk
+++ b/jack/Android.mk
@@ -143,7 +143,7 @@ LOCAL_JAVA_LIBRARIES := \
LOCAL_REQUIRED_MODULES:= \
core-stubs-mini \
- core \
+ core-libart \
bouncycastle \
ext \
core-junit \
@@ -171,8 +171,8 @@ test-jack-unit: PRIVATE_PATH := $(LOCAL_PATH)
test-jack-unit: $(LIB_JACK_UNIT_TESTS) $(LOCAL_PATH)/run-jack-unit-tests $(local_unit_libs) $(JACK_JAR)
$(hide) cd $(PRIVATE_PATH) && $(PRIVATE_RUN_TESTS) com.android.jack.PreSubmitTests
-local_long_libs := $(call java-lib-files,core bouncycastle core-junit ext framework guava services \
- libarity google-play-services-first-party telephony-common,)
+local_long_libs := $(call java-lib-files,core-libart bouncycastle core-junit ext framework guava services \
+ libarity prebuilt-google-play-services-first-party telephony-common,)
.PHONY: test-jack-long
test-jack-long: PRIVATE_RUN_TESTS := ./run-jack-unit-tests
test-jack-long: PRIVATE_PATH := $(LOCAL_PATH)