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

Add d8 to build tools

Browse Source 
BUG: 74015795
Test: make -j PRODUCT-sdk_phone_armv7-win_sdk showcommands sdk_repo
Test: make -j PRODUCT-sdk_arm64-sdk showcommands sdk_repo
(cherry picked from commit e05b47b6ea)

Change-Id: I2efb3004f89c4ad9874efce3b33de0132dd6e445
Merged-In: I2efb3004f89c4ad9874efce3b33de0132dd6e445
This commit is contained in:
Ivan Gavrilovic
2018-05-17 10:34:31 +01:00
parent c766e77398
commit d8602da2a9
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/sdk-windows-x86.atree
View File

@@ -97,6 +97,9 @@ dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.ba
rm build-tools/${PLATFORM_NAME}/dexdump rm build-tools/${PLATFORM_NAME}/dexdump
bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe
rm build-tools/${PLATFORM_NAME}/d8
prebuilts/r8/d8.bat build-tools/${PLATFORM_NAME}/d8.bat
rm build-tools/${PLATFORM_NAME}/llvm-rs-cc rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe

4
build/sdk.atree
View File

@@ -134,6 +134,10 @@ bin/dx build-tools/${PLATFORM_NAME}/dx
framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar
bin/dexdump build-tools/${PLATFORM_NAME}/dexdump bin/dexdump build-tools/${PLATFORM_NAME}/dexdump
# d8
prebuilts/r8/d8-master.jar build-tools/${PLATFORM_NAME}/lib/d8.jar
prebuilts/r8/d8 build-tools/${PLATFORM_NAME}/d8
# multi-dex # multi-dex
${OUT_DIR}/host/common/obj/JAVA_LIBRARIES/shrinkedAndroid_intermediates/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