commit 7ca5ad69db03b1a205926cc673f12c252fa21b8a
author Yohann Roussel <yroussel@google.com> Tue Jul 21 16:37:58 2015 +0200
committer Yohann Roussel <yroussel@google.com> Wed Jul 22 14:31:21 2015 +0000
tree f6bde41d2be8ce5591fe210bacf7bc7c85e5f12a
parent fdd7b08ed54ad39de30f59e1d567cef80496263e

Pick installed Jack & Jill for the sdk

Change-Id: I3dc4ecc83f07d2c8eea72b5d08fa2fe20bfbb6bf

build/Android.mk

diff --git a/build/Android.mk b/build/Android.mk
index 8b0124b..3f43695 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -83,6 +83,10 @@
 
 # ====================================================
 
+# 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
 

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index 78090b9..4e2a56b 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -129,10 +129,12 @@
 
 # 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