diff options
| author | Neil Fuller <nfuller@google.com> | 2014-06-19 10:43:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 10:43:40 +0000 |
| commit | 50f0eab1cd6087b742f78134a2aaa6e786187b6c (patch) | |
| tree | a9fc3d649210f16f5a096930f77fb38ff72c2e2c /core/tasks/cts.mk | |
| parent | 6db9e1c8872c1872cbc368cf8816a598eab26081 (diff) | |
| parent | cc317c40d3c087725e4ab9926ad83903495cd7c5 (diff) | |
| download | build-50f0eab1cd6087b742f78134a2aaa6e786187b6c.zip build-50f0eab1cd6087b742f78134a2aaa6e786187b6c.tar.gz build-50f0eab1cd6087b742f78134a2aaa6e786187b6c.tar.bz2 | |
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
Diffstat (limited to 'core/tasks/cts.mk')
| -rw-r--r-- | core/tasks/cts.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 6cf171a..c6d3d45 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -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) |