Package Jack and Jill directly from prebuilt

Instead of taking it from out.

Bug: 27372042

(cherry picked from commit 6f5779692a)

Change-Id: I9cc798e37655c8e86bf781c42c7b57b76070a1fd
This commit is contained in:
Yohann Roussel
2016-03-17 12:00:04 +01:00
parent f98b371020
commit 26707bffbf
2 changed files with 4 additions and 4 deletions

View File

@@ -91,8 +91,8 @@ ALL_SDK_FILES += $(android_jar_src_target)
# ====================================================
# The Jack & Jill compiler jars
ALL_SDK_FILES += $(HOST_OUT)/framework/jack.jar
ALL_SDK_FILES += $(HOST_OUT)/framework/jill.jar
ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar
ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).jar
# The uiautomator stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar

View File

@@ -139,8 +139,8 @@ prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/s
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
prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jack.jar
prebuilts/sdk/tools/jills/jill-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jill.jar
##############################################################################