aboutsummaryrefslogtreecommitdiffstats
path: root/anttasks/src
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-05-11 11:37:39 -0700
committerRaphael Moll <ralf@android.com>2012-05-17 22:03:23 -0700
commit6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5 (patch)
treecf7f0d17cf4f4aea3453323c22b55ddff5b45ac7 /anttasks/src
parent1e7051a6d0afff8eba85782d902dbd9392cf3744 (diff)
downloadsdk-6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5.zip
sdk-6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5.tar.gz
sdk-6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5.tar.bz2
SDK/ant: pass --ignore-assets flag to AAPT.
Requires change Ia4caa2a8 from frameworks/base.git Change-Id: Ifcb469a64146ac2ae65f8516ee9dcfb857a7e2aa
Diffstat (limited to 'anttasks/src')
-rw-r--r--anttasks/src/com/android/ant/AaptExecTask.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/anttasks/src/com/android/ant/AaptExecTask.java b/anttasks/src/com/android/ant/AaptExecTask.java
index d0fba5f..2b57277 100644
--- a/anttasks/src/com/android/ant/AaptExecTask.java
+++ b/anttasks/src/com/android/ant/AaptExecTask.java
@@ -96,6 +96,7 @@ public final class AaptExecTask extends SingleDependencyTask {
private String mLibraryResFolderPathRefid;
private String mLibraryPackagesRefid;
private boolean mNonConstantId;
+ private String mIgnoreAssets;
/**
* Input path that ignores the same folders/files that aapt does.
@@ -182,6 +183,10 @@ public final class AaptExecTask extends SingleDependencyTask {
mNonConstantId = nonConstantId;
}
+ public void setIgnoreAssets(String ignoreAssets) {
+ mIgnoreAssets = ignoreAssets;
+ }
+
public void setVersioncode(String versionCode) {
if (versionCode.length() > 0) {
try {
@@ -621,6 +626,12 @@ public final class AaptExecTask extends SingleDependencyTask {
task.createArg().setValue(mRFolder);
}
+ // ignore assets flag
+ if (mIgnoreAssets != null && mIgnoreAssets.length() > 0) {
+ task.createArg().setValue("--ignore-assets");
+ task.createArg().setValue(mIgnoreAssets);
+ }
+
// Use dependency generation
task.createArg().setValue("--generate-dependencies");