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

Merge "Package Jack and Jill directly from prebuilt"

Browse Source
This commit is contained in:
Yohann Roussel
2016-03-18 08:54:29 +00:00
committed by Gerrit Code Review
parent 782e50b099 6f5779692a
commit 241e1565fa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/Android.mk
View File

@@ -84,8 +84,8 @@ ALL_SDK_FILES += $(android_jar_full_target)
# ==================================================== # ====================================================
# The Jack & Jill compiler jars # The Jack & Jill compiler jars
ALL_SDK_FILES += $(HOST_OUT)/framework/jack.jar ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar
ALL_SDK_FILES += $(HOST_OUT)/framework/jill.jar ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).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

4
build/sdk.atree
View File

@@ -132,8 +132,8 @@ prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/s
dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainDexClasses.rules dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainDexClasses.rules
# Jack & Jill # Jack & Jill
${HOST_OUT}/framework/jack.jar build-tools/${PLATFORM_NAME}/jack.jar prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jack.jar
${HOST_OUT}/framework/jill.jar build-tools/${PLATFORM_NAME}/jill.jar prebuilts/sdk/tools/jills/jill-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jill.jar
############################################################################## ##############################################################################