StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usages of jill.jar, use jack instead

Browse Source 
Bug: 27113650
(cherry picked from commit d0bb7bdf5a)

Change-Id: Ie9be0d5c7e43ea857411431bb79db5cbb476484f
This commit is contained in:
Yohann Roussel
2016-01-19 16:08:34 +01:00
committed by Sebastien Hertz
parent f8a36a90c8
commit ccfa5c6761
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/definitions.mk
View File

@@ -2009,18 +2009,17 @@ endef
define transform-jar-to-jack define transform-jar-to-jack
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(JILL) $(PRIVATE_JILL_FLAGS) --output $@.tmpjill.jack $<
$(hide) mkdir -p $@.tmpjill.res $(hide) mkdir -p $@.tmpjill.res
$(hide) unzip -qo $< -d $@.tmpjill.res $(hide) unzip -qo $< -d $@.tmpjill.res
$(hide) find $@.tmpjill.res -iname "*.class" -delete $(hide) find $@.tmpjill.res -iname "*.class" -delete
$(hide) $(call call-jack) \ $(hide) $(call call-jack) \
$(PRIVATE_JACK_FLAGS) \
-D jack.import.resource.policy=keep-first \ -D jack.import.resource.policy=keep-first \
-D jack.import.type.policy=keep-first \ -D jack.import.type.policy=keep-first \
--import $@.tmpjill.jack \ --import $< \
--import-resource $@.tmpjill.res \ --import-resource $@.tmpjill.res \
--output-jack $@ --output-jack $@
$(hide) rm -rf $@.tmpjill.res $(hide) rm -rf $@.tmpjill.res
$(hide) rm $@.tmpjill.jack
endef endef
# Moves $1.tmp to $1 if necessary. This is designed to be used with # Moves $1.tmp to $1 if necessary. This is designed to be used with

9
core/prebuilt_internal.mk
View File

@@ -326,9 +326,14 @@ $(built_module) : $(common_javalib_jar)
endif # TARGET JAVA_LIBRARIES endif # TARGET JAVA_LIBRARIES
ifeq ($(LOCAL_MODULE_CLASS),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) \ $(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) $(transform-jar-to-jack)
# Update timestamps of .toc files for prebuilts so dependents will be # Update timestamps of .toc files for prebuilts so dependents will be