am f6b91cf3: Merge "Switch to 64-bit host tools in Linux/Mac SDK build."

* commit 'f6b91cf39b54e0a6f59e53f4de968b0745350d7e':
  Switch to 64-bit host tools in Linux/Mac SDK build.
This commit is contained in:
Ying Wang
2015-08-01 17:30:36 +00:00
committed by Android Git Automerger
3 changed files with 14 additions and 14 deletions

View File

@@ -22,11 +22,11 @@
# revision as specified in the source.properties.
lib/libLLVM.dylib strip build-tools/${PLATFORM_NAME}/../lib/libLLVM.dylib
lib/libbcc.dylib strip build-tools/${PLATFORM_NAME}/../lib/libbcc.dylib
lib/libbcinfo.dylib strip build-tools/${PLATFORM_NAME}/../lib/libbcinfo.dylib
lib/libclang.dylib strip build-tools/${PLATFORM_NAME}/../lib/libclang.dylib
lib/libc++.dylib strip build-tools/${PLATFORM_NAME}/../lib/libc++.dylib
lib64/libLLVM.dylib strip build-tools/${PLATFORM_NAME}/../lib64/libLLVM.dylib
lib64/libbcc.dylib strip build-tools/${PLATFORM_NAME}/../lib64/libbcc.dylib
lib64/libbcinfo.dylib strip build-tools/${PLATFORM_NAME}/../lib64/libbcinfo.dylib
lib64/libclang.dylib strip build-tools/${PLATFORM_NAME}/../lib64/libclang.dylib
lib64/libc++.dylib strip build-tools/${PLATFORM_NAME}/../lib64/libc++.dylib
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

View File

@@ -22,11 +22,11 @@
# revision as specified in the source.properties.
lib/libLLVM.so strip build-tools/${PLATFORM_NAME}/../lib/libLLVM.so
lib/libbcc.so strip build-tools/${PLATFORM_NAME}/../lib/libbcc.so
lib/libbcinfo.so strip build-tools/${PLATFORM_NAME}/../lib/libbcinfo.so
lib/libclang.so strip build-tools/${PLATFORM_NAME}/../lib/libclang.so
lib/libc++.so strip build-tools/${PLATFORM_NAME}/../lib/libc++.so
lib64/libLLVM.so strip build-tools/${PLATFORM_NAME}/../lib64/libLLVM.so
lib64/libbcc.so strip build-tools/${PLATFORM_NAME}/../lib64/libbcc.so
lib64/libbcinfo.so strip build-tools/${PLATFORM_NAME}/../lib64/libbcinfo.so
lib64/libclang.so strip build-tools/${PLATFORM_NAME}/../lib64/libclang.so
lib64/libc++.so strip build-tools/${PLATFORM_NAME}/../lib64/libc++.so
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

View File

@@ -78,18 +78,18 @@ bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdu
rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
rm build-tools/${PLATFORM_NAME}/../lib/libLLVM.so
rm build-tools/${PLATFORM_NAME}/../lib64/libLLVM.so
lib/libLLVM.dll strip build-tools/${PLATFORM_NAME}/../lib/libLLVM.dll
rm build-tools/${PLATFORM_NAME}/../lib/libclang.so
rm build-tools/${PLATFORM_NAME}/../lib64/libclang.so
lib/libclang.dll strip build-tools/${PLATFORM_NAME}/../lib/libclang.dll
#bcc not yet compiled on windows
rm build-tools/${PLATFORM_NAME}/../lib/libbcc.so
rm build-tools/${PLATFORM_NAME}/../lib64/libbcc.so
lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/../lib/libbcc.dll
rm build-tools/${PLATFORM_NAME}/../lib/libbcinfo.so
rm build-tools/${PLATFORM_NAME}/../lib64/libbcinfo.so
lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/../lib/libbcinfo.dll
rm build-tools/${PLATFORM_NAME}/bcc_compat