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

am ed6aaf3f: Merge "Add split-select tool to SDK build." into lmp-mr1-dev

Browse Source 
* commit 'ed6aaf3f727a7ed9ea208fcc535050dcfae64105':
  Add split-select tool to SDK build.
This commit is contained in:
Adam Lesinski
2014-11-11 01:00:00 +00:00
committed by Android Git Automerger
parent 8fbc5f53a6 ed6aaf3f72
commit 94527b094f
5 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/product_sdk.mk
View File

@@ -44,4 +44,5 @@ PRODUCT_PACKAGES += \
layoutlib-tests \ layoutlib-tests \
llvm-rs-cc \ llvm-rs-cc \
sqlite3 \ sqlite3 \
vgabios-cirrus.bin vgabios-cirrus.bin \
split-select

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

@@ -61,6 +61,9 @@ bin/etc1tool.exe strip platform-tools/etc1tool.exe
rm build-tools/${PLATFORM_NAME}/aapt rm build-tools/${PLATFORM_NAME}/aapt
bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.exe bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.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}/aidl rm build-tools/${PLATFORM_NAME}/aidl
bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe

1
build/sdk.atree
View File

@@ -79,6 +79,7 @@ development/sdk/build_tools_runtime.properties build-tools/${PLATFORM_NAME}/runt
# 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}/aapt bin/aapt strip build-tools/${PLATFORM_NAME}/aapt
bin/aidl strip build-tools/${PLATFORM_NAME}/aidl 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/zipalign strip build-tools/${PLATFORM_NAME}/zipalign
# renderscript (cc + headers) # renderscript (cc + headers)

1
build/tools/windows_sdk.mk
View File

@@ -41,6 +41,7 @@ WIN_TARGETS := \
prebuilt \ prebuilt \
sqlite3 \ sqlite3 \
zipalign \ zipalign \
split-select \
$(WIN_SDK_TARGETS) $(WIN_SDK_TARGETS)
# This is the list of *Linux* build tools that we need # This is the list of *Linux* build tools that we need

1
sdk/sdk_files_NOTICE.txt
View File

@@ -9740,6 +9740,7 @@ Notices for file(s):
/bin/dexdump /bin/dexdump
/bin/dx /bin/dx
/bin/jasmin /bin/jasmin
/bin/split-select
/framework/android-mock-generatorlib.jar /framework/android-mock-generatorlib.jar
/framework/jasmin.jar /framework/jasmin.jar
/lib/lib64cutils.a /lib/lib64cutils.a