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/prebuilt_internal.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/prebuilt_internal.mk')
| -rw-r--r-- | core/prebuilt_internal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 0a6ba9c..2d4f558 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -301,7 +301,7 @@ endif # TARGET JAVA_LIBRARIES ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) $(intermediates.COMMON)/classes.jack : $(my_prebuilt_src_file) $(LOCAL_MODULE_MAKEFILE) \ - $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) + $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK_JAR) $(transform-jar-to-jack) endif # JAVA_LIBRARIES |