From d8602da2a9eb5497459e6556aa110b82e76e841c Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Thu, 17 May 2018 10:34:31 +0100 Subject: [PATCH] Add d8 to build tools 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 e05b47b6ea224b5cf5e6058c012f5f42cd15d4d4) Change-Id: I2efb3004f89c4ad9874efce3b33de0132dd6e445 Merged-In: I2efb3004f89c4ad9874efce3b33de0132dd6e445 --- build/sdk-windows-x86.atree | 3 +++ build/sdk.atree | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index f70fd0b48..449508a6d 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -97,6 +97,9 @@ dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.ba rm build-tools/${PLATFORM_NAME}/dexdump 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 bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe diff --git a/build/sdk.atree b/build/sdk.atree index 4562eb581..22abbe1b5 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -134,6 +134,10 @@ bin/dx build-tools/${PLATFORM_NAME}/dx framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar 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 ${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