LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"

Browse Source 
* commit '9e2e8392ae22051d775e093e6faba721d8b919eb':
  Pick installed Jack & Jill for the sdk
This commit is contained in:
Yohann Roussel
2015-09-15 07:38:40 +00:00
committed by Android Git Automerger
parent a541aa6559 9e2e8392ae
commit 03ae930a73
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/Android.mk
View File

@@ -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 # The uiautomator stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar

6
build/sdk.atree
View File

@@ -129,10 +129,12 @@ bin/dexdump build-tools/${PLATFORM_NAME}/dexdu
# multi-dex # multi-dex
prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar 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 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 # Platform Component