From 233584bb806202364544f964b63561a7350fdc97 Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Thu, 17 Mar 2016 12:02:27 +0100
Subject: [PATCH] Remove JILL, JACK_JAR and JILL_JAR

Also ensure that sdk.atree can find jack.jar and jill.jar from prebuilt.

Bug: 27372042
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
---
 core/Makefile  | 1 +
 core/config.mk | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index a9646743a..e95807443 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2050,6 +2050,7 @@ $(INTERNAL_SDK_TARGET): $(deps)
 			-v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \
 			-v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \
 			-v "FONT_OUT=$(SDK_FONT_TEMP)" \
+			-v "JACK_SDKTOOL_VERSION=$(JACK_SDKTOOL_VERSION)" \
 			-o $(PRIVATE_DIR) && \
 		cp -f $(target_notice_file_txt) \
 				$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \
diff --git a/core/config.mk b/core/config.mk
index 85c850a20..8c0205526 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -489,8 +489,6 @@ prebuilt_sdk_tools_bin :=
 # ---------------------------------------------------------------
 # Generic tools.
 JACK := $(HOST_OUT_EXECUTABLES)/jack
-JACK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack.jar
-JILL_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jill.jar
 
 LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39
 # The default PKGDATADIR built in the prebuilt bison is a relative path
@@ -553,7 +551,6 @@ endif
 # Turn off jack warnings by default.
 DEFAULT_JACK_EXTRA_ARGS += --verbose error
 
-JILL := java -Xmx3500m -jar $(JILL_JAR)
 PROGUARD := external/proguard/bin/proguard.sh
 JAVATAGS := build/tools/java-event-log-tags.py
 RMTYPEDEFS := $(HOST_OUT_EXECUTABLES)/rmtypedefs