am 0273c81e: am 4ea82d63: Merge "Update prebuilts path."

* commit '0273c81e01c6c7462af00d9d5323422773bc1aa9':
  Update prebuilts path.
This commit is contained in:
Ying Wang
2015-04-23 22:19:22 +00:00
committed by Android Git Automerger
3 changed files with 9 additions and 9 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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