From 74e89c3ba81b93290b7f5a423416669f8e297d73 Mon Sep 17 00:00:00 2001 From: Yohann Roussel Date: Thu, 2 Oct 2014 15:51:27 +0200 Subject: 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 --- jack-tests/build/run-test-common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jack-tests') diff --git a/jack-tests/build/run-test-common.mk b/jack-tests/build/run-test-common.mk index 38f7a2d..33d106a 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 = \ -- cgit v1.1