From 8c61bb43f32d8ed7f2b073748ef7d1752e2a928e Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Tue, 21 Jul 2015 16:37:58 +0200
Subject: [PATCH] Pick installed Jack & Jill for the sdk

(cherry picked from commit 7ca5ad69db03b1a205926cc673f12c252fa21b8a)

Change-Id: Ied8d420f05012e2072f11bb7c63fd3c53afa664e
---
 build/Android.mk | 4 ++++
 build/sdk.atree  | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/Android.mk b/build/Android.mk
index 5d36d14df..38c739c78 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -83,6 +83,10 @@ ALL_SDK_FILES += $(android_jar_full_target)
 
 # ====================================================
 
+# The Jack & Jill compiler jars
+ALL_SDK_FILES += $(HOST_OUT)/framework/jack.jar
+ALL_SDK_FILES += $(HOST_OUT)/framework/jill.jar
+
 # The uiautomator stubs
 ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar
 
diff --git a/build/sdk.atree b/build/sdk.atree
index c0a163e70..8b9b772de 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -124,10 +124,12 @@ bin/dexdump                                   build-tools/${PLATFORM_NAME}/dexdu
 
 # multi-dex
 prebuilts/sdk/tools/lib/shrinkedAndroid.jar   build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar
-prebuilts/sdk/tools/jack.jar                  build-tools/${PLATFORM_NAME}/jack.jar
-prebuilts/sdk/tools/jill.jar                  build-tools/${PLATFORM_NAME}/jill.jar
 dalvik/dx/etc/mainDexClasses.rules            build-tools/${PLATFORM_NAME}/mainDexClasses.rules
 
+# Jack & Jill
+${HOST_OUT}/framework/jack.jar                build-tools/${PLATFORM_NAME}/jack.jar
+${HOST_OUT}/framework/jill.jar                build-tools/${PLATFORM_NAME}/jill.jar
+
 
 ##############################################################################
 # Platform Component