commit 47eadf1ecef5e898d63863edaa644615942ad0fd
author Xavier Ducrohet <xav@google.com> Thu Apr 03 22:21:08 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 03 22:21:08 2014 +0000
tree e0eb2f199f720c11c7b19378c6315964137e012c
parent 497b94df024cc6b4b6a5e98886dc85e8bc391994
parent 76510e2dd2d8a6854f6ee52f8e56ba966d5ffe27

Merge "Move ZipAlign to build-tools."

build/product_sdk.mk

diff --git a/build/product_sdk.mk b/build/product_sdk.mk
index a7fc08a..fc74b18 100644
--- a/build/product_sdk.mk
+++ b/build/product_sdk.mk
@@ -30,6 +30,7 @@
 	aapt \
 	adb \
 	aidl \
+	zipalign \
 	bcc_compat \
 	bios.bin \
 	commons-compress-1.0 \

build/sdk-windows-x86.atree

diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index a6beab1..7eac71e 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -51,6 +51,9 @@
 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

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index 86ce9fa..5025ba5 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -73,6 +73,7 @@
 # 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