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

resolved conflicts for merge of 0f32d65d to mnc-dr-dev-plus-aosp

Browse Source 
Change-Id: I5be45feb780c67c08dbef035f2f6481ae6338f90
This commit is contained in:
Ying Wang
2015-08-03 11:36:50 -07:00
parent df17743ab3 0f32d65d6c
commit 896afb075d
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

12
build/sdk-linux-x86.atree
View File

@@ -18,7 +18,7 @@
# Platform Tools Component # Platform Tools Component
############################################################################## ##############################################################################
lib/libc++.so strip platform-tools/lib/libc++.so lib64/libc++.so strip platform-tools/lib64/libc++.so
############################################################################## ##############################################################################
# Build Tools Component # Build Tools Component
@@ -28,11 +28,11 @@ lib/libc++.so strip platform-tools/lib/li
# revision as specified in the source.properties. # revision as specified in the source.properties.
lib/libLLVM.so strip build-tools/${PLATFORM_NAME}/lib/libLLVM.so lib64/libLLVM.so strip build-tools/${PLATFORM_NAME}/lib64/libLLVM.so
lib/libbcc.so strip build-tools/${PLATFORM_NAME}/lib/libbcc.so lib64/libbcc.so strip build-tools/${PLATFORM_NAME}/lib64/libbcc.so
lib/libbcinfo.so strip build-tools/${PLATFORM_NAME}/lib/libbcinfo.so lib64/libbcinfo.so strip build-tools/${PLATFORM_NAME}/lib64/libbcinfo.so
lib/libclang.so strip build-tools/${PLATFORM_NAME}/lib/libclang.so lib64/libclang.so strip build-tools/${PLATFORM_NAME}/lib64/libclang.so
lib/libc++.so strip build-tools/${PLATFORM_NAME}/lib/libc++.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/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/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld

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

@@ -78,18 +78,18 @@ 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}/lib/libLLVM.so rm build-tools/${PLATFORM_NAME}/lib64/libLLVM.so
lib/libLLVM.dll strip build-tools/${PLATFORM_NAME}/lib/libLLVM.dll 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 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}/lib/libbcc.so rm build-tools/${PLATFORM_NAME}/lib64/libbcc.so
lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/lib/libbcc.dll 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 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