summaryrefslogtreecommitdiffstats
path: root/core/tasks/cts.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-06-18 19:25:30 -0700
committerBrian Carlstrom <bdc@google.com>2014-06-18 19:25:30 -0700
commit55fa2ea206d89bbebfa3aa697437ae82b71faa22 (patch)
tree2391fede304727b82202dd09d91b5d5f8795f6d0 /core/tasks/cts.mk
parent0df5e7270b2b63f3e5955db9b34971a8d9094107 (diff)
parent8fd9944e8fc219347858be367f51736e9a1ef341 (diff)
downloadbuild-55fa2ea206d89bbebfa3aa697437ae82b71faa22.zip
build-55fa2ea206d89bbebfa3aa697437ae82b71faa22.tar.gz
build-55fa2ea206d89bbebfa3aa697437ae82b71faa22.tar.bz2
resolved conflicts for merge of 8fd9944e to master
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
Diffstat (limited to 'core/tasks/cts.mk')
-rw-r--r--core/tasks/cts.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 4b008a9..6cf171a 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -101,7 +101,7 @@ $(hide) java -Xmx256M \
$(PRIVATE_PARAMS) CollectAllTests $(1) $(2) $(3) "$(4)" $(5) $(6)
endef
-CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON)
+CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-libart,,COMMON)
CONSCRYPT_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,conscrypt,,COMMON)
BOUNCYCASTLE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,bouncycastle,,COMMON)
APACHEXML_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,apache-xml,,COMMON)