LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 73b3f5cd: am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."

Browse Source 
* commit '73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640':
  Fix SDK library paths for Windows and Darwin too.
This commit is contained in:
Dan Albert
2015-03-21 16:13:57 +00:00
committed by Android Git Automerger
parent bd4172b085 73b3f5cde4
commit 98aac243ac
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/sdk-darwin-x86.atree
View File

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

16
build/sdk-windows-x86.atree
View File

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