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