diff options
author | Yohann Roussel <yroussel@google.com> | 2014-11-19 14:01:06 +0100 |
---|---|---|
committer | Yohann Roussel <yroussel@google.com> | 2014-12-10 15:41:56 +0100 |
commit | 22c3fa6d73adcf14b38c7cf03446d4e2a892f682 (patch) | |
tree | e9b9fef177a0964b100cec8a9d60f0bf8ea624e6 /core/java.mk | |
parent | 30b0a1711e2af1e39a74886c0c0106c878811252 (diff) | |
download | build-22c3fa6d73adcf14b38c7cf03446d4e2a892f682.zip build-22c3fa6d73adcf14b38c7cf03446d4e2a892f682.tar.gz build-22c3fa6d73adcf14b38c7cf03446d4e2a892f682.tar.bz2 |
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
Diffstat (limited to 'core/java.mk')
-rw-r--r-- | core/java.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ endif # full_classes_jar is defined 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 |