diff options
| author | Ivan Gavrilovic <gavra@google.com> | 2017-09-28 17:23:42 +0100 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-27 14:43:02 +0000 |
| commit | 73afaab6202f19833926e9ca532775b833f780d9 (patch) | |
| tree | 410a56adb754ea0b4c40a6a9d72241d3faf3a22d | |
| parent | 96a9c1498a5d357b3b86c441eba75a202b0ab152 (diff) | |
| download | development-73afaab6202f19833926e9ca532775b833f780d9.tar.gz | |
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)
| -rw-r--r-- | build/Android.mk | 3 | ||||
| -rw-r--r-- | 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 |