Update structure for the build-tools/plat-tools.
Change-Id: Idf0d8cd41812ca92d8bb6910c4bd7d64eaaff51a
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 0b63098..0ed8e20 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -15,6 +15,12 @@
#
##############################################################################
+# Platform Tools Component
+##############################################################################
+
+lib/libc++.dylib strip platform-tools/lib/libc++.dylib
+
+##############################################################################
# Build Tools Component
##############################################################################
# Note that the build-tools sub-folder uses the platform-name as a placeholder
@@ -28,9 +34,9 @@
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}/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
+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
dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index c971a0e..63dcbc3 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -15,6 +15,12 @@
#
##############################################################################
+# Platform Tools Component
+##############################################################################
+
+lib/libc++.so strip platform-tools/lib/libc++.so
+
+##############################################################################
# Build Tools Component
##############################################################################
# Note that the build-tools sub-folder uses the platform-name as a placeholder
@@ -28,9 +34,9 @@
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}/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
+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
dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index e7985bd..cbde057 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -58,25 +58,25 @@
# at build-time. Packaging will later change that to the actual build-tools
# revision as specified in the source.properties.
-rm build-tools/${PLATFORM_NAME}/bin/aapt
-bin/aapt.exe strip build-tools/${PLATFORM_NAME}/bin/aapt.exe
+rm build-tools/${PLATFORM_NAME}/aapt
+bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.exe
-rm build-tools/${PLATFORM_NAME}/bin/split-select
-bin/split-select.exe strip build-tools/${PLATFORM_NAME}/bin/split-select.exe
+rm build-tools/${PLATFORM_NAME}/split-select
+bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split-select.exe
-rm build-tools/${PLATFORM_NAME}/bin/aidl
-bin/aidl.exe strip build-tools/${PLATFORM_NAME}/bin/aidl.exe
+rm build-tools/${PLATFORM_NAME}/aidl
+bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe
-rm build-tools/${PLATFORM_NAME}/bin/zipalign
-bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/bin/zipalign.exe
+rm build-tools/${PLATFORM_NAME}/zipalign
+bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/zipalign.exe
rm build-tools/${PLATFORM_NAME}/dx
dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.bat
-rm build-tools/${PLATFORM_NAME}/bin/dexdump
-bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/bin/dexdump.exe
+rm build-tools/${PLATFORM_NAME}/dexdump
+bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe
-rm build-tools/${PLATFORM_NAME}/bin/llvm-rs-cc
-bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/bin/llvm-rs-cc.exe
+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
lib/libLLVM.dll strip build-tools/${PLATFORM_NAME}/lib/libLLVM.dll
@@ -92,17 +92,17 @@
rm build-tools/${PLATFORM_NAME}/lib/libbcinfo.so
lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/lib/libbcinfo.dll
-rm build-tools/${PLATFORM_NAME}/bin/bcc_compat
-bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bin/bcc_compat.exe
+rm build-tools/${PLATFORM_NAME}/bcc_compat
+bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe
-rm build-tools/${PLATFORM_NAME}/bin/arm-linux-androideabi-ld
-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}/arm-linux-androideabi-ld
+prebuilts/sdk/tools/windows/bin/arm-linux-androideabi-ld.exe strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe
-rm build-tools/${PLATFORM_NAME}/bin/i686-linux-android-ld
-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}/i686-linux-android-ld
+prebuilts/sdk/tools/windows/bin/i686-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld.exe
-rm build-tools/${PLATFORM_NAME}/bin/mipsel-linux-android-ld
-prebuilts/sdk/tools/windows/bin/mipsel-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/bin/mipsel-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
dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat
diff --git a/build/sdk.atree b/build/sdk.atree
index 8b40971..5e11a05 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -79,14 +79,14 @@
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}/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
+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
# renderscript (cc + headers)
-bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/bin/llvm-rs-cc
-bin/bcc_compat strip build-tools/${PLATFORM_NAME}/bin/bcc_compat
+bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/llvm-rs-cc
+bin/bcc_compat strip build-tools/${PLATFORM_NAME}/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 @@
# dx
bin/dx build-tools/${PLATFORM_NAME}/dx
framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar
-bin/dexdump build-tools/${PLATFORM_NAME}/bin/dexdump
+bin/dexdump build-tools/${PLATFORM_NAME}/dexdump
# multi-dex
prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar
diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index 3933458..ab6652f 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,5 +1,5 @@
Pkg.UserSrc=false
// due to the codename this resolve to 22 instead of 23, so replace it with hardcoded version for now.
//Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=23.0.0 rc1
+Pkg.Revision=23.0.0 rc2
diff --git a/sdk/plat_tools_source.prop_template b/sdk/plat_tools_source.prop_template
index 5bbcd11..d9e01a3 100644
--- a/sdk/plat_tools_source.prop_template
+++ b/sdk/plat_tools_source.prop_template
@@ -1,4 +1,4 @@
Pkg.UserSrc=false
// due to the codename this resolve to 22 instead of 23, so replace it with hardcoded version for now.
//Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=23.0.0 rc1
+Pkg.Revision=23.0.0 rc2
