am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.

* commit '25907e2a994aacf2d45743f23bb8adc54a3d2d44':
  Update build-tools and support for multidex.
This commit is contained in:
Xavier Ducrohet
2014-10-29 18:52:23 +00:00
committed by Android Git Automerger
5 changed files with 7 additions and 1 deletions

View File

@@ -32,6 +32,8 @@ prebuilts/sdk/tools/darwin/arm-linux-androideabi-ld strip build-tools/${PLATFO
prebuilts/sdk/tools/darwin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld prebuilts/sdk/tools/darwin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/darwin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld prebuilts/sdk/tools/darwin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/multidex/mainDexClasses
############################################################################## ##############################################################################
# Docs Component # Docs Component
############################################################################## ##############################################################################

View File

@@ -32,4 +32,5 @@ prebuilts/sdk/tools/linux/arm-linux-androideabi-ld strip build-tools/${PLATFOR
prebuilts/sdk/tools/linux/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld prebuilts/sdk/tools/linux/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/linux/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld prebuilts/sdk/tools/linux/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/multidex/mainDexClasses

View File

@@ -101,6 +101,8 @@ prebuilts/sdk/tools/windows/i686-linux-android-ld.exe strip build-tools/${P
rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
prebuilts/sdk/tools/windows/mipsel-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld.exe prebuilts/sdk/tools/windows/mipsel-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld.exe
dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/multidex/mainDexClasses.bat
############################################################################## ##############################################################################
# Docs Component # Docs Component

View File

@@ -122,6 +122,7 @@ bin/dexdump build-tools/${PLATFORM_NAME}/dexdu
prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/multidex/shrinkedAndroid.jar prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/multidex/shrinkedAndroid.jar
prebuilts/sdk/tools/jack.jar build-tools/${PLATFORM_NAME}/jack.jar prebuilts/sdk/tools/jack.jar build-tools/${PLATFORM_NAME}/jack.jar
prebuilts/sdk/tools/jill.jar build-tools/${PLATFORM_NAME}/jill.jar prebuilts/sdk/tools/jill.jar build-tools/${PLATFORM_NAME}/jill.jar
dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/multidex/mainDexClasses.rules
############################################################################## ##############################################################################

View File

@@ -1,5 +1,5 @@
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0 Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1
Extra.Vendor=android Extra.Vendor=android
Extra.VendorId=android Extra.VendorId=android
Extra.VendorDisplay=Android Extra.VendorDisplay=Android