Ensure manifest changes trigger new builds.

The ProcessManifest task was not using manifest files as inputs
so changes in them would not trigger new builds.

Change-Id: I86b6b9ef2b1308c0cf36ccd538f1967ae7c1cc8f

2 files changed, 33 insertions, 2 deletions

diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java
index 9be56f1..f083dba 100644
--- a/builder/src/main/java/com/android/builder/AndroidBuilder.java
+++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java
@@ -327,7 +327,7 @@ public class AndroidBuilder {
         try {
             File mainLocation = config.getDefaultSourceSet().getAndroidManifest();
             File typeLocation = config.getBuildTypeSourceSet().getAndroidManifest();
-            if (typeLocation != null && typeLocation.isDirectory() == false) {
+            if (typeLocation != null && typeLocation.isFile() == false) {
                 typeLocation = null;
             }
 
diff --git a/builder/src/main/java/com/android/builder/VariantConfiguration.java b/builder/src/main/java/com/android/builder/VariantConfiguration.java
index b151c4f..33507de 100644
--- a/builder/src/main/java/com/android/builder/VariantConfiguration.java
+++ b/builder/src/main/java/com/android/builder/VariantConfiguration.java
@@ -401,6 +401,38 @@ public class VariantConfiguration {
         return list;
     }
 
+    public List<File> getManifestInputs() {
+        List<File> inputs = new ArrayList<File>();
+
+        File defaultManifest = mDefaultSourceSet.getAndroidManifest();
+        // this could not exist in a test project.
+        if (defaultManifest != null && defaultManifest.isFile()) {
+            inputs.add(defaultManifest);
+        }
+
+        File typeLocation = mBuildTypeSourceSet.getAndroidManifest();
+        if (typeLocation != null && typeLocation.isFile()) {
+            inputs.add(typeLocation);
+        }
+
+        for (SourceSet sourceSet : mFlavorSourceSets) {
+            File f = sourceSet.getAndroidManifest();
+            if (f != null && f.isFile()) {
+                inputs.add(f);
+            }
+        }
+
+        List<AndroidDependency> libs = getFullDirectDependencies();
+        for (AndroidDependency lib : libs) {
+            File manifest = lib.getManifest();
+            if (manifest != null && manifest.isFile()) {
+                inputs.add(manifest);
+            }
+        }
+
+        return inputs;
+    }
+
     /**
      * Returns the dynamic list of resource folders based on the configuration, its dependencies,
      * as well as tested config if applicable (test of a library).
@@ -456,7 +488,6 @@ public class VariantConfiguration {
         return list;
     }
 
-
     /**
      * Returns the compile classpath for this config. If the config tests a library, this
      * will include the classpath of the tested config