diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-03-03 17:14:09 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-03-05 14:54:06 +0100 |
| commit | 801f2c44d0a919284c72eca2be708aedb3a79d88 (patch) | |
| tree | 3f6493424233a45f6bc949db6b19d5323a1bb43d | |
| parent | 69792a41327f067cfaa2b25b0010535f42001ffe (diff) | |
| download | build-801f2c44d0a919284c72eca2be708aedb3a79d88.zip build-801f2c44d0a919284c72eca2be708aedb3a79d88.tar.gz build-801f2c44d0a919284c72eca2be708aedb3a79d88.tar.bz2 | |
Allow to pass arguments to Jill
Bug: 19026410
Change-Id: I3f3d7c0e7f8d6cc7150ae560b8734093798e8299
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 2 | ||||
| -rw-r--r-- | core/prebuilt_internal.mk | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 1fe5455..bac0829 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -113,6 +113,7 @@ LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, LOCAL_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS) LOCAL_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS) LOCAL_JACK_FLAGS:= +LOCAL_JILL_FLAGS:= LOCAL_CERTIFICATE:= LOCAL_SDK_VERSION:= LOCAL_SDK_RES_VERSION:= diff --git a/core/definitions.mk b/core/definitions.mk index 4a504bd..024c79d 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1789,7 +1789,7 @@ endef define transform-jar-to-jack $(hide) mkdir -p $(dir $@) - $(JILL) --output $@.tmpjill.jack $< + $(JILL) $(PRIVATE_JILL_FLAGS) --output $@.tmpjill.jack $< $(hide) mkdir -p $@.tmpjill.res $(hide) $(call unzip-jar-files,$<,$@.tmpjill.res) $(hide) find $@.tmpjill.res -iname "*.class" -delete diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index e8af1d9..59e3816 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -301,6 +301,7 @@ $(built_module) : $(common_javalib_jar) endif # TARGET JAVA_LIBRARIES ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) +$(intermediates.COMMON)/classes.jack : PRIVATE_JILL_FLAGS:=$(LOCAL_JILL_FLAGS) $(intermediates.COMMON)/classes.jack : $(my_prebuilt_src_file) $(LOCAL_MODULE_MAKEFILE) \ $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK_JAR) $(transform-jar-to-jack) |