Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 801f2c44 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Allow to pass arguments to Jill 

Bug: 19026410
Change-Id: I3f3d7c0e7f8d6cc7150ae560b8734093798e8299
parent 69792a41

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -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:=

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

core/prebuilt_internal.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)