Merge remote branch 'goog/master' into HEAD

1 files changed, 8 insertions, 0 deletions

diff --git a/anttasks/src/com/android/ant/XPathTask.java b/anttasks/src/com/android/ant/XPathTask.java
index b9cfb71..cdb5fdf 100644
--- a/anttasks/src/com/android/ant/XPathTask.java
+++ b/anttasks/src/com/android/ant/XPathTask.java
@@ -39,6 +39,7 @@ public class XPathTask extends Task {
     private Path mManifestFile;
     private String mProperty;
     private String mExpression;
+    private String mDefault;
 
     public void setInput(Path manifestFile) {
         mManifestFile = manifestFile;
@@ -52,6 +53,10 @@ public class XPathTask extends Task {
         mExpression = expression;
     }
 
+    public void setDefault(String defaultValue) {
+        mDefault = defaultValue;
+    }
+
     @Override
     public void execute() throws BuildException {
         try {
@@ -71,6 +76,9 @@ public class XPathTask extends Task {
 
             String file = mManifestFile.list()[0];
             String result = xpath.evaluate(mExpression, new InputSource(new FileInputStream(file)));
+            if (result.length() == 0 && mDefault != null) {
+                result = mDefault;
+            }
 
             getProject().setProperty(mProperty, result);
         } catch (XPathExpressionException e) {