diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-10-29 18:52:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 18:52:23 +0000 |
| commit | 0d574614cf568ec34e0804e6f7210a2d1a502d7f (patch) | |
| tree | 25cde8a4fa936fedd471d143ac7dcb6d25f936b3 /build | |
| parent | e67c313ea0781650b7a31308dbe2cc5919425a3e (diff) | |
| parent | 25907e2a994aacf2d45743f23bb8adc54a3d2d44 (diff) | |
am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.
* commit '25907e2a994aacf2d45743f23bb8adc54a3d2d44':
Update build-tools and support for multidex.
Diffstat (limited to 'build')
| -rw-r--r-- | build/sdk-darwin-x86.atree | 2 | ||||
| -rw-r--r-- | build/sdk-linux-x86.atree | 1 | ||||
| -rw-r--r-- | build/sdk-windows-x86.atree | 2 | ||||
| -rw-r--r-- | build/sdk.atree | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index 9f1eb38b7..e220246b1 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -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/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 ############################################################################## diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index 745be4925..ce359a2de 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -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/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld +dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/multidex/mainDexClasses diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 7820b8674..0653e91c9 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -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 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 diff --git a/build/sdk.atree b/build/sdk.atree index 2a9093c15..d4f8973ca 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -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/jack.jar build-tools/${PLATFORM_NAME}/jack.jar prebuilts/sdk/tools/jill.jar build-tools/${PLATFORM_NAME}/jill.jar +dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/multidex/mainDexClasses.rules ############################################################################## |