From f3ff0296c96a81a6ebb053bf39f7484d03dc4678 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 2 Apr 2014 18:13:35 -0700 Subject: [PATCH] Move ZipAlign to build-tools. DO NOT MERGE. (cherry picked from commit 76510e2dd2d8a6854f6ee52f8e56ba966d5ffe27) Change-Id: I2262795c0dfe9b103fda8c9a50a80d688ece5a12 --- build/product_sdk.mk | 1 + build/sdk-windows-x86.atree | 3 +++ build/sdk.atree | 1 + 3 files changed, 5 insertions(+) diff --git a/build/product_sdk.mk b/build/product_sdk.mk index a7fc08ae7..fc74b18f7 100644 --- a/build/product_sdk.mk +++ b/build/product_sdk.mk @@ -30,6 +30,7 @@ PRODUCT_PACKAGES += \ aapt \ adb \ aidl \ + zipalign \ bcc_compat \ bios.bin \ commons-compress-1.0 \ diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index a6beab132..7eac71e13 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -51,6 +51,9 @@ bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt. rm build-tools/${PLATFORM_NAME}/aidl 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 dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.bat rm build-tools/${PLATFORM_NAME}/dexdump diff --git a/build/sdk.atree b/build/sdk.atree index 6a77bfcde..e77d53507 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -73,6 +73,7 @@ development/sdk/build_tools_source.properties build-tools/${PLATFORM_NAME}/sour # 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/zipalign strip build-tools/${PLATFORM_NAME}/zipalign # renderscript (cc + headers) bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/llvm-rs-cc