diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index 6efec2539..0b63098c6 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -22,15 +22,15 @@ # 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 +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 -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 +prebuilts/sdk/tools/darwin/bin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/bin/arm-linux-androideabi-ld +prebuilts/sdk/tools/darwin/bin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/bin/i686-linux-android-ld +prebuilts/sdk/tools/darwin/bin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/bin/mipsel-linux-android-ld dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index ec8364f59..c971a0eb4 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -22,15 +22,15 @@ # 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 +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 -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 +prebuilts/sdk/tools/linux/bin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/bin/arm-linux-androideabi-ld +prebuilts/sdk/tools/linux/bin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/bin/i686-linux-android-ld +prebuilts/sdk/tools/linux/bin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/bin/mipsel-linux-android-ld dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 5fc9677e9..d3b247e5b 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -59,50 +59,50 @@ bin/etc1tool.exe strip platform-tools/etc1tool.exe # revision as specified in the source.properties. rm build-tools/${PLATFORM_NAME}/aapt -bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.exe +bin/aapt.exe strip build-tools/${PLATFORM_NAME}/bin/aapt.exe rm build-tools/${PLATFORM_NAME}/split-select -bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split-select.exe +bin/split-select.exe strip build-tools/${PLATFORM_NAME}/bin/split-select.exe rm build-tools/${PLATFORM_NAME}/aidl -bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe +bin/aidl.exe strip build-tools/${PLATFORM_NAME}/bin/aidl.exe rm build-tools/${PLATFORM_NAME}/zipalign -bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/zipalign.exe +bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/bin/zipalign.exe rm build-tools/${PLATFORM_NAME}/dx dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.bat rm build-tools/${PLATFORM_NAME}/dexdump -bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe +bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/bin/dexdump.exe 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}/bin/llvm-rs-cc.exe rm build-tools/${PLATFORM_NAME}/../lib/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 -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 rm build-tools/${PLATFORM_NAME}/../lib/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 -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 -bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe +bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bin/bcc_compat.exe rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld -prebuilts/sdk/tools/windows/bin/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}/bin/arm-linux-androideabi-ld.exe rm build-tools/${PLATFORM_NAME}/i686-linux-android-ld -prebuilts/sdk/tools/windows/bin/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}/bin/i686-linux-android-ld.exe rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld -prebuilts/sdk/tools/windows/bin/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}/bin/mipsel-linux-android-ld.exe dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat diff --git a/build/sdk.atree b/build/sdk.atree index 798597a2c..b66dbd04d 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -79,14 +79,14 @@ development/sdk/build_tools_source.properties build-tools/${PLATFORM_NAME}/sour development/sdk/build_tools_runtime.properties build-tools/${PLATFORM_NAME}/runtime.properties # build tools from out/host/$(HOST_OS)-$(HOST_ARCH)/ -bin/aapt strip build-tools/${PLATFORM_NAME}/aapt -bin/aidl strip build-tools/${PLATFORM_NAME}/aidl -bin/split-select strip build-tools/${PLATFORM_NAME}/split-select -bin/zipalign strip build-tools/${PLATFORM_NAME}/zipalign +bin/aapt strip build-tools/${PLATFORM_NAME}/bin/aapt +bin/aidl strip build-tools/${PLATFORM_NAME}/bin/aidl +bin/split-select strip build-tools/${PLATFORM_NAME}/bin/split-select +bin/zipalign strip build-tools/${PLATFORM_NAME}/bin/zipalign # renderscript (cc + headers) -bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/llvm-rs-cc -bin/bcc_compat strip build-tools/${PLATFORM_NAME}/bcc_compat +bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/bin/llvm-rs-cc +bin/bcc_compat strip build-tools/${PLATFORM_NAME}/bin/bcc_compat frameworks/rs/scriptc build-tools/${PLATFORM_NAME}/renderscript/include external/clang/lib/Headers build-tools/${PLATFORM_NAME}/renderscript/clang-include external/clang/LICENSE.TXT build-tools/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT @@ -119,7 +119,7 @@ prebuilts/sdk/renderscript/lib/x86/libclcore.bc build-tools/${PLATFORM_NAM # dx bin/dx build-tools/${PLATFORM_NAME}/dx framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar -bin/dexdump build-tools/${PLATFORM_NAME}/dexdump +bin/dexdump build-tools/${PLATFORM_NAME}/bin/dexdump # multi-dex prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar