commit 40f3300577d4b55926728744f1d25c08aa4e4a8b
author Neil Fuller <nfuller@google.com> Thu Jun 19 10:34:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 19 10:34:02 2014 +0000
tree e75469bf38abe8359bb745d2463f0d6eaebb3dc5
parent 32d25fdabfaadc95292b43a29b695d8229333bcf
parent fa63e30605ff723cfef493540553dabdf0440339

am fa63e306: Merge "Fix the CTS build now that core is gone"

* commit 'fa63e30605ff723cfef493540553dabdf0440339':
  Fix the CTS build now that core is gone

core/tasks/cts.mk

diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 49daa71..c521fa3 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -298,7 +298,7 @@
 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)