From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Thu, 29 Oct 2009 00:03:46 +0000 (+0000)
Subject: OI Safe: added zipalign to Ant build
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=8c51615bb5e6ba974da824aab9a8eb3614deaa0b;p=android-vcpass-oisafe

OI Safe: added zipalign to Ant build


git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2356 72b678ce-9140-0410-bee8-679b907dd61a
---

diff --git a/build.xml b/build.xml
index f8d092f..4898445 100644
--- a/build.xml
+++ b/build.xml
@@ -111,12 +111,18 @@ storepass=*password of keystore*
         <os family="windows"/>
     </condition>
 	
-	<property name="out-signed-package" value="${outdir}/${ant.project.name}-${version}.apk" />
+	<property name="out-signed-package" value="${outdir}/${ant.project.name}-signed.apk" />
 	<condition property="out-signed-package-ospath"
 	            value="${basedir}\${out-signed-package}"
 	            else="${basedir}/${out-signed-package}" >
 	        <os family="windows"/>
 	</condition>
+	<property name="out-aligned-package" value="${outdir}/${ant.project.name}-${version}.apk" />
+	<condition property="out-aligned-package-ospath"
+	            value="${basedir}\${out-aligned-package}"
+	            else="${basedir}/${out-aligned-package}" >
+	        <os family="windows"/>
+	</condition>
 
 	<property name="out-release-source" value="${releasedir}/${ant.project.name}-source-${version}" />
 	<condition property="out-release-source-ospath"
@@ -141,6 +147,9 @@ storepass=*password of keystore*
     <condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder" >
         <os family="windows"/>
     </condition>
+    <condition property="zipalign" value="${android-tools}/zipalign.exe" else="${android-tools}/zipalign" >
+        <os family="windows"/>
+    </condition>
 	
 	<condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder" >
 	       <os family="windows"/>
@@ -378,6 +387,12 @@ storepass=*password of keystore*
             <arg value="${external-libs-ospath}" />
         </exec>
     	<signjar jar="${out-unsigned-package-ospath}" alias="${cert-alias}" keystore="${keystore}" storepass="${storepass}" keypass="${keypass}" signedjar="${out-signed-package-ospath}"/>
+        <exec executable="${zipalign}" failonerror="true">
+            <arg value="-f" />
+            <arg value="4" />
+            <arg value="${out-signed-package-ospath}" />
+            <arg value="${out-aligned-package-ospath}" />
+        </exec>
     	
     </target>