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

Commit b0a15c4d authored by Sebastien Hertz's avatar Sebastien Hertz Committed by Android (Google) Code Review
Browse files

Merge "Remove usages of jill.jar, use jack instead" into nyc-dev

parents 405e71dc d87cc99a

core/definitions.mk

+2 −3
Original line number Diff line number Diff line
@@ -2062,18 +2062,17 @@ endef 


define transform-jar-to-jack

	$(hide) mkdir -p $(dir $@)

	$(JILL) $(PRIVATE_JILL_FLAGS) --output $@.tmpjill.jack $<

	$(hide) mkdir -p $@.tmpjill.res

	$(hide) unzip -qo $< -d $@.tmpjill.res

	$(hide) find $@.tmpjill.res -iname "*.class" -delete

	$(hide) $(call call-jack) \

	    $(PRIVATE_JACK_FLAGS) \

        -D jack.import.resource.policy=keep-first \

        -D jack.import.type.policy=keep-first \

	    --import $@.tmpjill.jack \

	    --import $< \

	    --import-resource $@.tmpjill.res \

	    --output-jack $@

	$(hide) rm -rf $@.tmpjill.res

	$(hide) rm $@.tmpjill.jack

endef



# Moves $1.tmp to $1 if necessary. This is designed to be used with

core/prebuilt_internal.mk

+7 −2
Original line number Diff line number Diff line
@@ -347,9 +347,14 @@ $(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)



ifneq ($(LOCAL_JILL_FLAGS),)

$(error LOCAL_JILL_FLAGS is not supported any more, please use jack options in LOCAL_JACK_FLAGS instead)

endif



$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS)

$(intermediates.COMMON)/classes.jack : $(my_src_jar) $(LOCAL_MODULE_MAKEFILE_DEP) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JILL_JAR) $(JACK) | setup-jack-server

        $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK) | setup-jack-server

	$(transform-jar-to-jack)



# Update timestamps of .toc files for prebuilts so dependents will be