commit 22c3fa6d73adcf14b38c7cf03446d4e2a892f682
author Yohann Roussel <yroussel@google.com> Wed Nov 19 14:01:06 2014 +0100
committer Yohann Roussel <yroussel@google.com> Wed Dec 10 15:41:56 2014 +0100
tree e9b9fef177a0964b100cec8a9d60f0bf8ea624e6
parent 30b0a1711e2af1e39a74886c0c0106c878811252

Adapt to Jack and Jill Brest release

Includes cherry-picks of:
2e78d2f4263bc7c0f90d58af7014017f16aa3ce6 Jack option --import-res was renamed --import-resource
fdc913ee86fe0c45581178b901a673fdd7937e03 Update references to Jack type collison policy
8d83d1b21ec678fb9fb1c6ee643ace46d5f700ce Rename jill tmp file
8a1c98ce4ba0b4db39f274d6258b6a08bbc3ec2c Ensure that jar-arg-list is never shared
8d83d1b21ec678fb9fb1c6ee643ace46d5f700ce Remove manipulations of jack libraries

Change-Id: I3ee159d408ba5281ac15c9836dc4fd2bdeb845d3

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 51dc3fe..9de9bcb 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -557,7 +557,7 @@
 
 ifeq ($(strip $(LOCAL_USE_JACK)),true)
 $(LOCAL_INTERMEDIATE_TARGETS): \
-	PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jayces
+	PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack
 
 ifdef full_classes_jar
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_DEBUG_FLAGS := -g