am cc317c40: am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone"
* commit 'cc317c40d3c087725e4ab9926ad83903495cd7c5': Fix the CTS build now that core is gone
This commit is contained in:
commit
50f0eab1cd
|
@ -308,7 +308,7 @@ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.okhttp.xml: $(CTS_CORE_X
|
|||
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)
|
||||
|
|
Loading…
Reference in New Issue