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

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

Browse Source 
am: b959fe4863

Change-Id: I3fb7d98d89970c4117604a8467fa7dcaa4d933d0
This commit is contained in:
Ivan Gavrilovic
2017-09-27 00:26:24 +00:00
committed by android-build-merger
parent f5dd447b3c b959fe4863
commit cc2ede2f6b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/sdk.atree
View File

@@ -140,7 +140,7 @@ 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
prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar ${OUT_DIR}/host/common/obj/JAVA_LIBRARIES/shrinkedAndroid_intermediates/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