From c61caf11a0f4fe2d25a221bdd187480eda53175f Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 19 Jun 2014 11:21:08 +0100 Subject: [PATCH] Fix the CTS build now that core is gone Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8 --- core/tasks/cts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 49daa71b1..c521fa37a 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -298,7 +298,7 @@ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.harmony_sql.xml: $(CTS_C CORE_VM_TEST_TF_DESC := $(CTS_TESTCASES_OUT)/android.core.vm-tests-tf.xml # core tests only needed to get hold of junit-framework-classes -CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON) +CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-libart,,COMMON) JUNIT_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-junit,,COMMON) GEN_CLASSPATH := $(CORE_INTERMEDIATES)/classes.jar:$(JUNIT_INTERMEDIATES)/classes.jar:$(VMTESTSTF_JAR):$(DDMLIB_JAR):$(TF_JAR)