am 8821b239: am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools."

* commit '8821b239d175f441c1631f9ce04f9b0109dd3a72':
  Move ZipAlign to build-tools.
This commit is contained in:
Xavier Ducrohet
2014-04-04 03:26:31 +00:00
committed by Android Git Automerger
3 changed files with 5 additions and 0 deletions

View File

@@ -30,6 +30,7 @@ PRODUCT_PACKAGES += \
aapt \ aapt \
adb \ adb \
aidl \ aidl \
zipalign \
bcc_compat \ bcc_compat \
bios.bin \ bios.bin \
commons-compress-1.0 \ commons-compress-1.0 \

View File

@@ -51,6 +51,9 @@ bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.
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
rm build-tools/${PLATFORM_NAME}/zipalign
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}/dexdump rm build-tools/${PLATFORM_NAME}/dexdump

View File

@@ -73,6 +73,7 @@ development/sdk/build_tools_source.properties build-tools/${PLATFORM_NAME}/sour
# 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/zipalign strip build-tools/${PLATFORM_NAME}/zipalign
# renderscript (cc + headers) # renderscript (cc + headers)
bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/llvm-rs-cc bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/llvm-rs-cc