Remove usages of jill.jar, use jack instead
Bug: 27113650
(cherry picked from commit d0bb7bdf5a62fd1cd0469e0b5d6b54feaecb3cdd)
Change-Id: Ie9be0d5c7e43ea857411431bb79db5cbb476484f
diff --git a/core/definitions.mk b/core/definitions.mk
index ab7f9a6..d2f973f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2009,18 +2009,17 @@
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