Allow to pass arguments to Jill
Bug: 19026410
Change-Id: I3f3d7c0e7f8d6cc7150ae560b8734093798e8299
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_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 @@
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 e8af1d90..59e3816 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -301,6 +301,7 @@
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)
