diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-27 14:50:56 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-27 14:50:56 +0000 |
| commit | 151aa79c438963b32af05b28a047b320048af1a5 (patch) | |
| tree | 410a56adb754ea0b4c40a6a9d72241d3faf3a22d | |
| parent | dee91a1e13957137ee3e4d02af760909ce5b36ca (diff) | |
| parent | 73afaab6202f19833926e9ca532775b833f780d9 (diff) | |
| download | android_development-151aa79c438963b32af05b28a047b320048af1a5.tar.gz android_development-151aa79c438963b32af05b28a047b320048af1a5.tar.bz2 android_development-151aa79c438963b32af05b28a047b320048af1a5.zip | |
Merge cherrypicks of [3134552, 3130583, 3131953, 3131954, 3131955, 3131956, 3131957, 3131958, 3131959, 3132062, 3132336, 3131074, 3133939, 3131024, 3131025, 3131026, 3130584, 3130879, 3130880] into oc-mr1-release
Change-Id: I71818f1f6c71254f439f041366a8724ad9a6d49a
| -rw-r--r-- | build/Android.mk | 3 | ||||
| -rw-r--r-- | build/sdk.atree | 6 | ||||
| -rw-r--r-- | sdk/build_tools_source.prop_template | 5 |
3 files changed, 8 insertions, 6 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 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 |