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

Merge "Revert "Use shrinkedAndroid.jar from OUT for build tools""

Browse Source 
am: 039d8dbd73

Change-Id: I5f3fc291eab9e2b5fc54d09b218e0fac6cf7836d
This commit is contained in:
Colin Cross
2017-09-27 03:30:05 +00:00
committed by android-build-merger
parent cc2ede2f6b 039d8dbd73
commit 4bc7e6a23e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/sdk.atree
View File

@@ -140,9 +140,9 @@ framework/dx.jar build-tools/${PLATFORM_NAME}/lib/d
bin/dexdump build-tools/${PLATFORM_NAME}/dexdump bin/dexdump build-tools/${PLATFORM_NAME}/dexdump
# multi-dex # multi-dex
${OUT_DIR}/host/common/obj/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar
dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainDexClasses.rules dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainDexClasses.rules
dalvik/dx/etc/mainDexClassesNoAapt.rules build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules dalvik/dx/etc/mainDexClassesNoAapt.rules build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules
# Jack & Jill # Jack & Jill
prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jack.jar prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jack.jar