Change the BuildConfig.FLAVOR_# value to include the group name.

Change-Id: I6232e532af66a3bd33318a45ed078041f973ca9a

3 files changed, 22 insertions, 8 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
index 0cc4e35..32a13ad 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/AppPlugin.groovy
@@ -438,9 +438,15 @@ class AppPlugin extends com.android.build.gradle.BasePlugin implements Plugin<Pr
                     buildTypeData.sourceSet)
 
             for (ProductFlavorData data : flavorDataList) {
+                String dimensionName = "";
+                if (data.productFlavor instanceof GroupableProductFlavorDsl) {
+                    dimensionName = ((GroupableProductFlavorDsl) data.productFlavor).flavorGroup
+                }
                 variantConfig.addProductFlavor(
                         data.productFlavor,
-                        data.sourceSet)
+                        data.sourceSet,
+                        dimensionName
+                )
                 variantProviders.add(data.mainProvider)
             }
 
@@ -491,9 +497,14 @@ class AppPlugin extends com.android.build.gradle.BasePlugin implements Plugin<Pr
         List<ConfigurationProvider> testVariantProviders = []
 
         for (ProductFlavorData data : flavorDataList) {
+            String dimensionName = "";
+            if (data.productFlavor instanceof GroupableProductFlavorDsl) {
+                dimensionName = ((GroupableProductFlavorDsl) data.productFlavor).flavorGroup
+            }
             testVariantConfig.addProductFlavor(
                     data.productFlavor,
-                    data.testSourceSet)
+                    data.testSourceSet,
+                    dimensionName)
             testVariantProviders.add(data.testProvider)
         }
 
diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
index 18d43c9..ddd7b4a 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -587,8 +587,8 @@ public abstract class BasePlugin {
             variantConfiguration.flavorName
         }
 
-        generateBuildConfigTask.conventionMapping.flavorNames = {
-            variantConfiguration.flavorNames
+        generateBuildConfigTask.conventionMapping.flavorNamesWithDimensionNames = {
+            variantConfiguration.flavorNamesWithDimensionNames
         }
 
         generateBuildConfigTask.conventionMapping.items = {
diff --git a/gradle/src/main/groovy/com/android/build/gradle/tasks/GenerateBuildConfig.groovy b/gradle/src/main/groovy/com/android/build/gradle/tasks/GenerateBuildConfig.groovy
index cba93f0..1f4d7af 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/tasks/GenerateBuildConfig.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/tasks/GenerateBuildConfig.groovy
@@ -43,7 +43,7 @@ public class GenerateBuildConfig extends IncrementalTask {
     String flavorName
 
     @Input
-    List<String> flavorNames
+    List<String> flavorNamesWithDimensionNames
 
     @Input
     String buildTypeName
@@ -86,9 +86,12 @@ public class GenerateBuildConfig extends IncrementalTask {
             generator.addField("String", "VERSION_NAME", "\"${getVersionName()}\"")
         }
 
-        int i = 1;
-        for (String name : getFlavorNames()) {
-            generator.addField("String", "FLAVOR${i++}", "\"$name\"")
+        List<String> flavors = getFlavorNamesWithDimensionNames();
+        int count = flavors.size();
+        if (count > 1) {
+            for (int i = 0; i < count ; i+=2) {
+                generator.addField("String", "FLAVOR_${flavors.get(i+1)}", "\"${flavors.get(i)}\"")
+            }
         }
 
         generator.generate();