diff options
| author | Ying Wang <wangying@google.com> | 2015-04-23 22:19:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 22:19:22 +0000 |
| commit | f3dc31847e29c7d7ed10be0557f20ac232b6f52e (patch) | |
| tree | e3d74543179d80068fb13512f00b33c842a22794 /build | |
| parent | 73567b8f6dd8db5c31ce4d992eb31d340d0163b3 (diff) | |
| parent | 0273c81e01c6c7462af00d9d5323422773bc1aa9 (diff) | |
| download | android_development-f3dc31847e29c7d7ed10be0557f20ac232b6f52e.tar.gz android_development-f3dc31847e29c7d7ed10be0557f20ac232b6f52e.tar.bz2 android_development-f3dc31847e29c7d7ed10be0557f20ac232b6f52e.zip | |
am 0273c81e: am 4ea82d63: Merge "Update prebuilts path."
* commit '0273c81e01c6c7462af00d9d5323422773bc1aa9':
Update prebuilts path.
Diffstat (limited to 'build')
| -rw-r--r-- | build/sdk-darwin-x86.atree | 6 | ||||
| -rw-r--r-- | build/sdk-linux-x86.atree | 6 | ||||
| -rw-r--r-- | build/sdk-windows-x86.atree | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index 0ebccf2cf..6efec2539 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -28,9 +28,9 @@ lib/libbcinfo.dylib strip build-tools/${PLATFO lib/libclang.dylib strip build-tools/${PLATFORM_NAME}/../lib/libclang.dylib lib/libc++.dylib strip build-tools/${PLATFORM_NAME}/../lib/libc++.dylib -prebuilts/sdk/tools/darwin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-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/bin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld +prebuilts/sdk/tools/darwin/bin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld +prebuilts/sdk/tools/darwin/bin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index 71b5c0d89..ec8364f59 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -28,9 +28,9 @@ lib/libbcinfo.so strip build-tools/${PLATFOR lib/libclang.so strip build-tools/${PLATFORM_NAME}/../lib/libclang.so lib/libc++.so strip build-tools/${PLATFORM_NAME}/../lib/libc++.so -prebuilts/sdk/tools/linux/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-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/bin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld +prebuilts/sdk/tools/linux/bin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld +prebuilts/sdk/tools/linux/bin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index e3c4add0f..5fc9677e9 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -96,13 +96,13 @@ rm build-tools/${PLATFORM_NAME}/bcc_compat bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld -prebuilts/sdk/tools/windows/arm-linux-androideabi-ld.exe strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe +prebuilts/sdk/tools/windows/bin/arm-linux-androideabi-ld.exe strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe rm build-tools/${PLATFORM_NAME}/i686-linux-android-ld -prebuilts/sdk/tools/windows/i686-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld.exe +prebuilts/sdk/tools/windows/bin/i686-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld.exe 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/bin/mipsel-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld.exe dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat |