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

Update structure for the build-tools/plat-tools.

Browse Source 
Change-Id: Idf0d8cd41812ca92d8bb6910c4bd7d64eaaff51a
This commit is contained in:
Xavier Ducrohet
2015-06-02 10:20:16 -07:00
parent 24d9df6a4f
commit f4c73da84f
6 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,12 @@
# limitations under the License. # limitations under the License.
# #
##############################################################################
# Platform Tools Component
##############################################################################
lib/libc++.dylib strip platform-tools/lib/libc++.dylib
############################################################################## ##############################################################################
# Build Tools Component # Build Tools Component
############################################################################## ##############################################################################
@@ -28,9 +34,9 @@ lib/libbcinfo.dylib strip build-tools/${PLATFO
lib/libclang.dylib strip build-tools/${PLATFORM_NAME}/lib/libclang.dylib lib/libclang.dylib strip build-tools/${PLATFORM_NAME}/lib/libclang.dylib
lib/libc++.dylib strip build-tools/${PLATFORM_NAME}/lib/libc++.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/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}/bin/i686-linux-android-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}/bin/mipsel-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 dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses

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

@@ -14,6 +14,12 @@
# limitations under the License. # limitations under the License.
# #
##############################################################################
# Platform Tools Component
##############################################################################
lib/libc++.so strip platform-tools/lib/libc++.so
############################################################################## ##############################################################################
# Build Tools Component # Build Tools Component
############################################################################## ##############################################################################
@@ -28,9 +34,9 @@ lib/libbcinfo.so strip build-tools/${PLATFOR
lib/libclang.so strip build-tools/${PLATFORM_NAME}/lib/libclang.so lib/libclang.so strip build-tools/${PLATFORM_NAME}/lib/libclang.so
lib/libc++.so strip build-tools/${PLATFORM_NAME}/lib/libc++.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/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}/bin/i686-linux-android-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}/bin/mipsel-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 dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses

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

@@ -58,25 +58,25 @@ bin/etc1tool.exe strip platform-tools/etc1tool.exe
# at build-time. Packaging will later change that to the actual build-tools # at build-time. Packaging will later change that to the actual build-tools
# revision as specified in the source.properties. # revision as specified in the source.properties.
rm build-tools/${PLATFORM_NAME}/bin/aapt rm build-tools/${PLATFORM_NAME}/aapt
bin/aapt.exe strip build-tools/${PLATFORM_NAME}/bin/aapt.exe bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.exe
rm build-tools/${PLATFORM_NAME}/bin/split-select rm build-tools/${PLATFORM_NAME}/split-select
bin/split-select.exe strip build-tools/${PLATFORM_NAME}/bin/split-select.exe bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split-select.exe
rm build-tools/${PLATFORM_NAME}/bin/aidl rm build-tools/${PLATFORM_NAME}/aidl
bin/aidl.exe strip build-tools/${PLATFORM_NAME}/bin/aidl.exe bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe
rm build-tools/${PLATFORM_NAME}/bin/zipalign rm build-tools/${PLATFORM_NAME}/zipalign
bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/bin/zipalign.exe bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/zipalign.exe
rm build-tools/${PLATFORM_NAME}/dx rm build-tools/${PLATFORM_NAME}/dx
dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.bat dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.bat
rm build-tools/${PLATFORM_NAME}/bin/dexdump rm build-tools/${PLATFORM_NAME}/dexdump
bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/bin/dexdump.exe bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe
rm build-tools/${PLATFORM_NAME}/bin/llvm-rs-cc rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/bin/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}/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
@@ -92,17 +92,17 @@ lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/lib/l
rm build-tools/${PLATFORM_NAME}/lib/libbcinfo.so 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}/bin/bcc_compat rm build-tools/${PLATFORM_NAME}/bcc_compat
bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bin/bcc_compat.exe bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe
rm build-tools/${PLATFORM_NAME}/bin/arm-linux-androideabi-ld rm build-tools/${PLATFORM_NAME}/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 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 rm build-tools/${PLATFORM_NAME}/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 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 rm build-tools/${PLATFORM_NAME}/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 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 dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat

14
build/sdk.atree
View File

@@ -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 development/sdk/build_tools_runtime.properties build-tools/${PLATFORM_NAME}/runtime.properties
# build tools from out/host/$(HOST_OS)-$(HOST_ARCH)/ # build tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
bin/aapt strip build-tools/${PLATFORM_NAME}/bin/aapt bin/aapt strip build-tools/${PLATFORM_NAME}/aapt
bin/aidl strip build-tools/${PLATFORM_NAME}/bin/aidl bin/aidl strip build-tools/${PLATFORM_NAME}/aidl
bin/split-select strip build-tools/${PLATFORM_NAME}/bin/split-select bin/split-select strip build-tools/${PLATFORM_NAME}/split-select
bin/zipalign strip build-tools/${PLATFORM_NAME}/bin/zipalign bin/zipalign strip build-tools/${PLATFORM_NAME}/zipalign
# renderscript (cc + headers) # renderscript (cc + headers)
bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/bin/llvm-rs-cc bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/llvm-rs-cc
bin/bcc_compat strip build-tools/${PLATFORM_NAME}/bin/bcc_compat bin/bcc_compat strip build-tools/${PLATFORM_NAME}/bcc_compat
frameworks/rs/scriptc build-tools/${PLATFORM_NAME}/renderscript/include frameworks/rs/scriptc build-tools/${PLATFORM_NAME}/renderscript/include
external/clang/lib/Headers build-tools/${PLATFORM_NAME}/renderscript/clang-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 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 # dx
bin/dx build-tools/${PLATFORM_NAME}/dx bin/dx build-tools/${PLATFORM_NAME}/dx
framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar 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 # multi-dex
prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar

2
sdk/build_tools_source.prop_template
View File

@@ -1,5 +1,5 @@
Pkg.UserSrc=false Pkg.UserSrc=false
// due to the codename this resolve to 22 instead of 23, so replace it with hardcoded version for now. // 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=${PLATFORM_SDK_VERSION}.0.0
Pkg.Revision=23.0.0 rc1 Pkg.Revision=23.0.0 rc2

2
sdk/plat_tools_source.prop_template
View File

@@ -1,4 +1,4 @@
Pkg.UserSrc=false Pkg.UserSrc=false
// due to the codename this resolve to 22 instead of 23, so replace it with hardcoded version for now. // 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=${PLATFORM_SDK_VERSION}.0.0
Pkg.Revision=23.0.0 rc1 Pkg.Revision=23.0.0 rc2