aboutsummaryrefslogtreecommitdiffstats
path: root/anttasks/src/com/android/ant/ManifestMergerTask.java
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-09-28 15:29:21 -0700
committerRaphael Moll <ralf@android.com>2012-09-28 15:46:39 -0700
commit2b426ae27c0be8ebd26bc69ad59007e45487568b (patch)
tree6fb2982a35a1a9a0bd4457d27f00b4857f1ed7e1 /anttasks/src/com/android/ant/ManifestMergerTask.java
parentc439a89ccdcf7123f52cb528d57d5ef78881e0da (diff)
downloadsdk-2b426ae27c0be8ebd26bc69ad59007e45487568b.zip
sdk-2b426ae27c0be8ebd26bc69ad59007e45487568b.tar.gz
sdk-2b426ae27c0be8ebd26bc69ad59007e45487568b.tar.bz2
ManifestMerger: ability to inject attributes.
Change-Id: Icbebe1dd3c8cf51f7d38b585a78264d01977e943
Diffstat (limited to 'anttasks/src/com/android/ant/ManifestMergerTask.java')
-rw-r--r--anttasks/src/com/android/ant/ManifestMergerTask.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/anttasks/src/com/android/ant/ManifestMergerTask.java b/anttasks/src/com/android/ant/ManifestMergerTask.java
index 7339a08..6c53069 100644
--- a/anttasks/src/com/android/ant/ManifestMergerTask.java
+++ b/anttasks/src/com/android/ant/ManifestMergerTask.java
@@ -152,7 +152,8 @@ public class ManifestMergerTask extends SingleDependencyTask {
if (merger.process(
new File(mOutManifest),
appManifestFile,
- libraries.toArray(new File[libraries.size()])) == false) {
+ libraries.toArray(new File[libraries.size()]),
+ null /*injectAttributes*/) == false) {
throw new BuildException();
}
}