From 96a9c1498a5d357b3b86c441eba75a202b0ab152 Mon Sep 17 00:00:00 2001
From: Kathy Kam <kkam@google.com>
Date: Thu, 5 Oct 2017 20:39:35 -0700
Subject: Updating BuildTools to 26.0.3

Test: N/A
Bug: 62286076

Change-Id: Id779f124852d45c087f28a5c37a4a329d231b4e0
(cherry picked from commit d6f94646f7d7844cccbad2b8221540206eadb89c)
---
 sdk/build_tools_source.prop_template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index e72dd4ddf..13f84d93e 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,4 +1,3 @@
 Pkg.UserSrc=false
-Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-#Pkg.Revision=27.0.0
-
+#Pkg.Revision=${PLATFORM_SDK_VERSION}.0.2
+Pkg.Revision=26.0.3
-- 
cgit v1.2.3


From 73afaab6202f19833926e9ca532775b833f780d9 Mon Sep 17 00:00:00 2001
From: Ivan Gavrilovic <gavra@google.com>
Date: Thu, 28 Sep 2017 17:23:42 +0100
Subject: Add shrinkedAndroid.jar to build tools

(cherry picked from commit b6d3f47313a7318e3022bf91e2219ba012246149)

Bug: 62286076
Test: built the sdk locally
Change-Id: Ifb2a88e715b4bb2f1077aaed4fd724b3a13cbe2d
Merged-In: Ifb2a88e715b4bb2f1077aaed4fd724b3a13cbe2d
(cherry picked from commit be785e8694492732af713be41c45dd989682014a)
---
 build/Android.mk | 3 +++
 build/sdk.atree  | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/Android.mk b/build/Android.mk
index c1f503e0c..7e11d56a1 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -103,6 +103,9 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiaut
 # org.apache.http.legacy.jar stubs
 ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/javalib.jar
 
+# shrinkedAndroid.jar for multidex support
+ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar
+
 # $(1): the Java library name
 define _package_sdk_library
 $(eval _psm_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(1)_intermediates/javalib.jar)
diff --git a/build/sdk.atree b/build/sdk.atree
index 7c8b63c49..5000e3707 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
-- 
cgit v1.2.3