Fix overlay issue with new source providers.

Change-Id: I31fc26a938043a0b58f3d58a6f1d6d675fff702d

18 files changed, 31 insertions, 23 deletions

diff --git a/builder/src/main/java/com/android/builder/VariantConfiguration.java b/builder/src/main/java/com/android/builder/VariantConfiguration.java
index 4c861fe..f55d0d6 100644
--- a/builder/src/main/java/com/android/builder/VariantConfiguration.java
+++ b/builder/src/main/java/com/android/builder/VariantConfiguration.java
@@ -864,13 +864,6 @@ public class VariantConfiguration implements TestData {
             }
         }
 
-        if (mMultiFlavorSourceProvider != null) {
-            File variantLocation = mMultiFlavorSourceProvider.getManifestFile();
-            if (variantLocation.isFile()) {
-                inputs.add(variantLocation);
-            }
-        }
-
         if (mBuildTypeSourceProvider != null) {
             File typeLocation = mBuildTypeSourceProvider.getManifestFile();
             if (typeLocation.isFile()) {
@@ -878,6 +871,13 @@ public class VariantConfiguration implements TestData {
             }
         }
 
+        if (mMultiFlavorSourceProvider != null) {
+            File variantLocation = mMultiFlavorSourceProvider.getManifestFile();
+            if (variantLocation.isFile()) {
+                inputs.add(variantLocation);
+            }
+        }
+
         for (SourceProvider sourceProvider : mFlavorSourceProviders) {
             File f = sourceProvider.getManifestFile();
             if (f.isFile()) {
@@ -941,6 +941,14 @@ public class VariantConfiguration implements TestData {
             resourceSets.add(resourceSet);
         }
 
+        // multiflavor specific overrides flavor
+        if (mMultiFlavorSourceProvider != null) {
+            Collection<File> variantResDirs = mMultiFlavorSourceProvider.getResDirectories();
+            resourceSet = new ResourceSet(getFlavorName());
+            resourceSet.addSources(variantResDirs);
+            resourceSets.add(resourceSet);
+        }
+
         // build type overrides the flavors
         if (mBuildTypeSourceProvider != null) {
             Collection<File> typeResDirs = mBuildTypeSourceProvider.getResDirectories();
@@ -949,14 +957,6 @@ public class VariantConfiguration implements TestData {
             resourceSets.add(resourceSet);
         }
 
-        // multiflavor specific overrides flavor/build type
-        if (mMultiFlavorSourceProvider != null) {
-            Collection<File> variantResDirs = mMultiFlavorSourceProvider.getResDirectories();
-            resourceSet = new ResourceSet(getFullName());
-            resourceSet.addSources(variantResDirs);
-            resourceSets.add(resourceSet);
-        }
-
         // variant specific overrides all
         if (mVariantSourceProvider != null) {
             Collection<File> variantResDirs = mVariantSourceProvider.getResDirectories();
@@ -1013,6 +1013,14 @@ public class VariantConfiguration implements TestData {
             assetSets.add(assetSet);
         }
 
+        // multiflavor specific overrides flavor
+        if (mMultiFlavorSourceProvider != null) {
+            Collection<File> variantResDirs = mMultiFlavorSourceProvider.getAssetsDirectories();
+            assetSet = new AssetSet(getFlavorName());
+            assetSet.addSources(variantResDirs);
+            assetSets.add(assetSet);
+        }
+
         // build type overrides flavors
         if (mBuildTypeSourceProvider != null) {
             Collection<File> typeResDirs = mBuildTypeSourceProvider.getAssetsDirectories();
@@ -1021,14 +1029,6 @@ public class VariantConfiguration implements TestData {
             assetSets.add(assetSet);
         }
 
-        // multiflavor specific overrides flavor/build type
-        if (mMultiFlavorSourceProvider != null) {
-            Collection<File> variantResDirs = mMultiFlavorSourceProvider.getAssetsDirectories();
-            assetSet = new AssetSet(getFullName());
-            assetSet.addSources(variantResDirs);
-            assetSets.add(assetSet);
-        }
-
         // variant specific overrides all
         if (mVariantSourceProvider != null) {
             Collection<File> variantResDirs = mVariantSourceProvider.getAssetsDirectories();
diff --git a/gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java b/gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java
index 6512f0d..e0c985b 100644
--- a/gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java
+++ b/gradle/src/build-test/groovy/com/android/build/gradle/ManualBuildTest.java
@@ -63,6 +63,8 @@ public class ManualBuildTest extends BuildTest {
         checkImageColor(drawableOutput, "no_overlay.png", GREEN);
         checkImageColor(drawableOutput, "debug_overlay.png", GREEN);
         checkImageColor(drawableOutput, "beta_overlay.png", GREEN);
+        checkImageColor(drawableOutput, "free_overlay.png", GREEN);
+        checkImageColor(drawableOutput, "free_beta_overlay.png", GREEN);
         checkImageColor(drawableOutput, "free_beta_debug_overlay.png", GREEN);
         checkImageColor(drawableOutput, "free_normal_overlay.png", RED);
 
@@ -71,6 +73,8 @@ public class ManualBuildTest extends BuildTest {
         checkImageColor(drawableOutput, "no_overlay.png", GREEN);
         checkImageColor(drawableOutput, "debug_overlay.png", GREEN);
         checkImageColor(drawableOutput, "beta_overlay.png", RED);
+        checkImageColor(drawableOutput, "free_overlay.png", GREEN);
+        checkImageColor(drawableOutput, "free_beta_overlay.png", RED);
         checkImageColor(drawableOutput, "free_beta_debug_overlay.png", RED);
         checkImageColor(drawableOutput, "free_normal_overlay.png", GREEN);
 
@@ -79,6 +83,8 @@ public class ManualBuildTest extends BuildTest {
         checkImageColor(drawableOutput, "no_overlay.png", GREEN);
         checkImageColor(drawableOutput, "debug_overlay.png", GREEN);
         checkImageColor(drawableOutput, "beta_overlay.png", GREEN);
+        checkImageColor(drawableOutput, "free_overlay.png", RED);
+        checkImageColor(drawableOutput, "free_beta_overlay.png", RED);
         checkImageColor(drawableOutput, "free_beta_debug_overlay.png", RED);
         checkImageColor(drawableOutput, "free_normal_overlay.png", RED);
     }
diff --git a/tests/overlay3/build.gradle b/tests/overlay3/build.gradle
index a0c7179..1043f5e 100644
--- a/tests/overlay3/build.gradle
+++ b/tests/overlay3/build.gradle
@@ -17,7 +17,9 @@ android {
 
     sourceSets {
        beta.setRoot('movedSrc/beta')
+       free.setRoot('movedSrc/free')
        debug.setRoot('movedSrc/debug')
+       freeBeta.setRoot('movedSrc/freeBeta')
        freeBetaDebug.setRoot('movedSrc/freeBetaDebug')
        freeNormal.setRoot('movedSrc/freeNormal')
     }
diff --git a/tests/overlay3/movedSrc/beta/res/drawable/debug_overlay.png b/tests/overlay3/movedSrc/beta/res/drawable/debug_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/beta/res/drawable/debug_overlay.png
diff --git a/tests/overlay3/movedSrc/beta/res/drawable/free_beta_debug_overlay.png b/tests/overlay3/movedSrc/beta/res/drawable/free_beta_debug_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/beta/res/drawable/free_beta_debug_overlay.png
diff --git a/tests/overlay3/movedSrc/beta/res/drawable/free_beta_overlay.png b/tests/overlay3/movedSrc/beta/res/drawable/free_beta_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/beta/res/drawable/free_beta_overlay.png
diff --git a/tests/overlay3/movedSrc/beta/res/drawable/free_overlay.png b/tests/overlay3/movedSrc/beta/res/drawable/free_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/beta/res/drawable/free_overlay.png
diff --git a/tests/overlay3/movedSrc/debug/res/drawable/free_beta_debug_overlay.png b/tests/overlay3/movedSrc/debug/res/drawable/free_beta_debug_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/debug/res/drawable/free_beta_debug_overlay.png
diff --git a/tests/overlay3/movedSrc/free/res/drawable/debug_overlay.png b/tests/overlay3/movedSrc/free/res/drawable/debug_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/free/res/drawable/debug_overlay.png
diff --git a/tests/overlay3/movedSrc/free/res/drawable/free_beta_debug_overlay.png b/tests/overlay3/movedSrc/free/res/drawable/free_beta_debug_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/free/res/drawable/free_beta_debug_overlay.png
diff --git a/tests/overlay3/movedSrc/free/res/drawable/free_beta_overlay.png b/tests/overlay3/movedSrc/free/res/drawable/free_beta_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/free/res/drawable/free_beta_overlay.png
diff --git a/tests/overlay3/movedSrc/free/res/drawable/free_overlay.png b/tests/overlay3/movedSrc/free/res/drawable/free_overlay.png
new file mode 100644
index 0000000..47e1adf
--- /dev/null
+++ b/tests/overlay3/movedSrc/free/res/drawable/free_overlay.png
diff --git a/tests/overlay3/movedSrc/freeBeta/res/drawable/debug_overlay.png b/tests/overlay3/movedSrc/freeBeta/res/drawable/debug_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/freeBeta/res/drawable/debug_overlay.png
diff --git a/tests/overlay3/movedSrc/freeBeta/res/drawable/free_beta_debug_overlay.png b/tests/overlay3/movedSrc/freeBeta/res/drawable/free_beta_debug_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/freeBeta/res/drawable/free_beta_debug_overlay.png
diff --git a/tests/overlay3/movedSrc/freeBeta/res/drawable/free_beta_overlay.png b/tests/overlay3/movedSrc/freeBeta/res/drawable/free_beta_overlay.png
new file mode 100644
index 0000000..47e1adf
--- /dev/null
+++ b/tests/overlay3/movedSrc/freeBeta/res/drawable/free_beta_overlay.png
diff --git a/tests/overlay3/movedSrc/freeNormal/res/drawable/debug_overlay.png b/tests/overlay3/movedSrc/freeNormal/res/drawable/debug_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/movedSrc/freeNormal/res/drawable/debug_overlay.png
diff --git a/tests/overlay3/src/main/res/drawable/free_beta_overlay.png b/tests/overlay3/src/main/res/drawable/free_beta_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/src/main/res/drawable/free_beta_overlay.png
diff --git a/tests/overlay3/src/main/res/drawable/free_overlay.png b/tests/overlay3/src/main/res/drawable/free_overlay.png
new file mode 100644
index 0000000..b55e544
--- /dev/null
+++ b/tests/overlay3/src/main/res/drawable/free_overlay.png