commit 1a4814a824c47b0560ef7b65cc060b9f39587cc9
author Tor Norbye <tnorbye@google.com> Tue Dec 03 18:20:00 2013 -0800
committer Tor Norbye <tnorbye@google.com> Tue Dec 03 18:20:00 2013 -0800
tree b526db12a27ca0fa0d04a5c17b5ea238e4b71d45
parent c618bf644e0a6fdcddf0c7b1f728ac20a5fc7993

Fix resource overlay order in lint

Change-Id: Icdce9de26db387006bfd9029d69712bc08f7d03d

gradle/src/main/groovy/com/android/build/gradle/internal/LintGradleProject.java

diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/LintGradleProject.java b/gradle/src/main/groovy/com/android/build/gradle/internal/LintGradleProject.java
index fb50f00..09471a0 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/LintGradleProject.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/LintGradleProject.java
@@ -5,6 +5,7 @@
 
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
+import com.android.builder.model.AndroidArtifact;
 import com.android.builder.model.AndroidLibrary;
 import com.android.builder.model.AndroidProject;
 import com.android.builder.model.BuildTypeContainer;
@@ -152,22 +153,13 @@
         private List<SourceProvider> getSourceProviders() {
             if (mProviders == null) {
                 List<SourceProvider> providers = Lists.newArrayList();
+                AndroidArtifact mainArtifact = mVariant.getMainArtifact();
 
                 SourceProvider defaultProvider = mProject.getDefaultConfig().getSourceProvider();
                 if (defaultProvider != null) {
                     providers.add(defaultProvider);
                 }
 
-                SourceProvider sourceProvider = mVariant.getMainArtifact().getVariantSourceProvider();
-                if (sourceProvider != null) {
-                    providers.add(sourceProvider);
-                }
-
-                sourceProvider = mVariant.getMainArtifact().getMultiFlavorSourceProvider();
-                if (sourceProvider != null) {
-                    providers.add(sourceProvider);
-                }
-
                 for (String flavorName : mVariant.getProductFlavors()) {
                     for (ProductFlavorContainer flavor : mProject.getProductFlavors()) {
                         if (flavorName.equals(flavor.getProductFlavor().getName())) {
@@ -180,6 +172,11 @@
                     }
                 }
 
+                SourceProvider multiProvider = mainArtifact.getMultiFlavorSourceProvider();
+                if (multiProvider != null) {
+                    providers.add(multiProvider);
+                }
+
                 String buildTypeName = mVariant.getBuildType();
                 for (BuildTypeContainer buildType : mProject.getBuildTypes()) {
                     if (buildTypeName.equals(buildType.getBuildType().getName())) {
@@ -190,6 +187,12 @@
                         break;
                     }
                 }
+
+                SourceProvider variantProvider =  mainArtifact.getVariantSourceProvider();
+                if (variantProvider != null) {
+                    providers.add(variantProvider);
+                }
+
                 mProviders = providers;
             }