From fca823453b7bb1c4c13c012c789addb25df0d4e8 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 31 Jul 2015 13:38:57 -0700 Subject: [PATCH] Switch to 64-bit host tools in Linux/Mac SDK build. Bug: 22776595 Change-Id: Iadf56f045f6920d4e97c8b1219b1b3907213b12b --- build/sdk-darwin-x86.atree | 10 +++++----- build/sdk-linux-x86.atree | 10 +++++----- build/sdk-windows-x86.atree | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index 6efec2539..e0c4e8ed9 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -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 diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index ec8364f59..08a118f39 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -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 diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 5fc9677e9..19b8a4efd 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -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