summaryrefslogtreecommitdiffstats
path: root/jack-tests/build
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2014-10-02 15:51:27 +0200
committerYohann Roussel <yroussel@google.com>2014-10-23 18:42:29 +0200
commit74e89c3ba81b93290b7f5a423416669f8e297d73 (patch)
tree3b0d79def4ea5e6ef6705bb6e513afb9d52d9024 /jack-tests/build
parentdee2472546a6570f51cea4b0334bbfdcca392498 (diff)
downloadtoolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.tar.gz
toolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.tar.bz2
toolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.zip
Adapt to lmp changes
Build has changed, Libcore targets were renamed. This allows to build the images or to mm in toolchain/jack but not to run test-jack. Conflicts: junit4/Android.mk Change-Id: Idcf3076569c2712560d59165d664b9c9a4e15a1b
Diffstat (limited to 'jack-tests/build')
-rw-r--r--jack-tests/build/run-test-common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/jack-tests/build/run-test-common.mk b/jack-tests/build/run-test-common.mk
index 38f7a2dc..33d106a0 100644
--- a/jack-tests/build/run-test-common.mk
+++ b/jack-tests/build/run-test-common.mk
@@ -25,7 +25,7 @@ $(call _java-lib-dir,$(1),$(2))/classes.dex
endef
jack.intermediate := $(call intermediates-dir-for,JAVA_LIBRARIES,jack,1,COMMON)
-BOOTCLASSPATH_MODULE := core-hostdex junit4-hostdex-jack
+BOOTCLASSPATH_MODULE := core-libart-hostdex junit4-hostdex-jack
BOOTCLASSPATH_LIBS := $(call java-lib-files,$(BOOTCLASSPATH_MODULE),true)
BOOTCLASSPATH_DEX := $(call java-dex-files,$(BOOTCLASSPATH_MODULE),true)
junit.dex = \