aboutsummaryrefslogtreecommitdiffstats
path: root/files/ant
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-09-28 18:26:54 -0700
committerXavier Ducrohet <xav@android.com>2011-09-28 19:38:23 -0700
commit78c89f931135c11c45f26590ea5ae29577bced85 (patch)
tree88e1a35589b46206e7e677756ba6006bbb116058 /files/ant
parent09aefc28c531b6e56010f3054d54568864fd200a (diff)
downloadsdk-78c89f931135c11c45f26590ea5ae29577bced85.zip
sdk-78c89f931135c11c45f26590ea5ae29577bced85.tar.gz
sdk-78c89f931135c11c45f26590ea5ae29577bced85.tar.bz2
Also process and cache the png files in libraries.
The png in the libraries were not processed by the crunch step. Because aapt never processes png files anymore (relying on the crunch step to do it), the png files in libraries were never processed. While this is less a problem for standard png files, this completely breaks 9-patches that must be processed to actually behaves as 9-patch. Change-Id: I0a1fe14ea34f6d36a368b456494410945afc3c44
Diffstat (limited to 'files/ant')
-rw-r--r--files/ant/build.xml19
1 files changed, 8 insertions, 11 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml
index 9387ff2..134a0a3 100644
--- a/files/ant/build.xml
+++ b/files/ant/build.xml
@@ -748,17 +748,14 @@
<!-- Updates the pre-processed PNG cache -->
<target name="-crunch">
- <!-- only crunch if *not* a library project -->
- <do-only-if-not-library elseText="Library project: do not optimize PNGs..." >
- <exec executable="${aapt}" taskName="crunch">
- <arg value="crunch" />
- <arg value="-v" />
- <arg value="-S" />
- <arg path="${resource.absolute.dir}" />
- <arg value="-C" />
- <arg path="${out.res.absolute.dir}" />
- </exec>
- </do-only-if-not-library>
+ <exec executable="${aapt}" taskName="crunch">
+ <arg value="crunch" />
+ <arg value="-v" />
+ <arg value="-S" />
+ <arg path="${resource.absolute.dir}" />
+ <arg value="-C" />
+ <arg path="${out.res.absolute.dir}" />
+ </exec>
</target>
<!-- Puts the project's resources into the output package file