diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-10-31 13:47:47 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@google.com> | 2014-10-31 13:47:47 -0700 |
| commit | 8641d4dada2166c116c7663e33f47b297993038e (patch) | |
| tree | 2b94e140da4631275fbad5b6daac3c3949239a11 /build | |
| parent | 8361bb0dfa16a3acc7752324e4690598ae0f2320 (diff) | |
Move mulit-dex files around.
This allows the mainDexClasses to work by
finding shrinkedAndroid.jar and proguard (from
the SDK Tools folder) correctly.
Change-Id: Ib3d85f775876b8a487af04bd072f6d8877f31d3b
Diffstat (limited to 'build')
| -rw-r--r-- | build/sdk-darwin-x86.atree | 2 | ||||
| -rw-r--r-- | build/sdk-linux-x86.atree | 2 | ||||
| -rw-r--r-- | build/sdk-windows-x86.atree | 2 | ||||
| -rw-r--r-- | build/sdk.atree | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index e220246b1..084dcff15 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -32,7 +32,7 @@ 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 +dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses ############################################################################## # Docs Component diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index ce359a2de..6eb976b47 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -32,5 +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 +dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 0653e91c9..a0e19ba22 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -101,7 +101,7 @@ 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 +dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat ############################################################################## diff --git a/build/sdk.atree b/build/sdk.atree index d4f8973ca..5021d83b5 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -119,10 +119,10 @@ 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}/multidex/shrinkedAndroid.jar +prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/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 +dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainDexClasses.rules ############################################################################## |