From d87cc99af2bde92c6b822a0d44191cc402d44ac8 Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Tue, 19 Jan 2016 16:08:34 +0100
Subject: [PATCH] Remove usages of jill.jar, use jack instead

Bug: 27113650
(cherry picked from commit d0bb7bdf5a62fd1cd0469e0b5d6b54feaecb3cdd)

Change-Id: I218ed2bda032b00bee4c52994a0aadce6d699133
---
 core/definitions.mk       | 5 ++---
 core/prebuilt_internal.mk | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/definitions.mk b/core/definitions.mk
index 7772b1521..1936a1e93 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -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
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index d44f09019..d383bf277 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -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