Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40f33005 authored by Neil Fuller's avatar Neil Fuller Committed by Android Git Automerger
Browse files

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

* commit 'fa63e306':
  Fix the CTS build now that core is gone
parents 32d25fda fa63e306

core/tasks/cts.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)