From 63cc4a06e5b3d4ec1f83966083ca1d4229182493 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Tue, 26 Sep 2017 20:52:47 +0100 Subject: [PATCH] Use shrinkedAndroid.jar from OUT for build tools Test: make -j PRODUCT-sdk_arm64-sdk showcommands sdk_repo Change-Id: Ia6ed11f27b7f225ea900205707051ec66cbb5e8b --- build/sdk.atree | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index 7c8b63c49..db39e5619 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -140,9 +140,9 @@ framework/dx.jar build-tools/${PLATFORM_NAME}/lib/d bin/dexdump build-tools/${PLATFORM_NAME}/dexdump # multi-dex -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/mainDexClassesNoAapt.rules build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules +${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/mainDexClassesNoAapt.rules build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules # Jack & Jill prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jack.jar