diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-09-22 19:14:22 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-09-23 11:37:24 -0700 |
| commit | 5d9df469ba3662afefa78447c323cdfccb40b60b (patch) | |
| tree | 4ab02a8ad8c6fac71b45e70c0f0aafdb8b5c8934 /files | |
| parent | 0802f23053c774a0ed8d122532a9694f742cc74f (diff) | |
| download | sdk-5d9df469ba3662afefa78447c323cdfccb40b60b.zip sdk-5d9df469ba3662afefa78447c323cdfccb40b60b.tar.gz sdk-5d9df469ba3662afefa78447c323cdfccb40b60b.tar.bz2 | |
CherryPick 15fa2c from master. do not merge.
Make the zip align ant step check timestamp on intput/output.
If the output is more recent than the input, zipalign does nothing.
Change-Id: I51146f0da9697e8f8bfc19e4d6bea80006f101b5
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index 42e7420..9387ff2 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -84,6 +84,10 @@ classname="com.android.ant.ApkBuilderTask" classpathref="android.antlibs" /> + <taskdef name="zipalign" + classname="com.android.ant.ZipAlignTask" + classpathref="android.antlibs" /> + <taskdef name="xpath" classname="com.android.ant.XPathTask" classpathref="android.antlibs" /> @@ -150,11 +154,6 @@ <condition property="verbosity" value="verbose" else="quiet"> <istrue value="${verbose}" /> </condition> - <!-- This is needed to switch verbosity of zipalign. Depends exclusively on 'verbose' - --> - <condition property="v.option" value="-v" else=""> - <istrue value="${verbose}" /> - </condition> <!-- properties for signing in release mode --> <condition property="has.keystore"> @@ -293,14 +292,11 @@ <attribute name="in.package" /> <attribute name="out.package" /> <sequential> - <echo>Running zip align on final apk...</echo> - <exec executable="${zipalign}" failonerror="true"> - <arg line="${v.option}" /> - <arg value="-f" /> - <arg value="4" /> - <arg path="@{in.package}" /> - <arg path="@{out.package}" /> - </exec> + <zipalign + executable="${zipalign}" + input="@{in.package}" + output="@{out.package}" + verbose="${verbose}" /> </sequential> </macrodef> |