commit 29b1afee9e0e2634df2f2a7790d3100d24a3bfb4
author Yohann Roussel <yroussel@google.com> Thu Mar 17 12:02:27 2016 +0100
committer Yohann Roussel <yroussel@google.com> Fri Mar 18 11:38:05 2016 +0100
tree 425d358a05176006ddcb17532bb68071d3d3c4aa
parent f7cadb8cfd5bf0393d14029a5678df38b63d963b

Remove JILL, JACK_JAR and JILL_JAR

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

Bug: 27372042

(cherry picked from commit 233584bb806202364544f964b63561a7350fdc97)

Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index c41bedd..7c991be 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2101,6 +2101,7 @@
 			-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 && \