From 0b0089711adb46457348c10f7f287389d866f3d4 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 17 May 2018 19:59:23 +0300
Subject: [PATCH] Android Extensions: Avoid duplicating variants in compiler
 plugin options

---
 .../org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
index cda43e5fe16..0c2eb668705 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
@@ -204,7 +204,9 @@ class AndroidSubplugin : KotlinGradleSubplugin<KotlinCompile> {
                 addSourceSetAsVariant(flavorName)
             }
 
-            addSourceSetAsVariant(variantName)
+            if (buildTypeName != variantName && buildTypeName != flavorName) {
+                addSourceSetAsVariant(variantName)
+            }
         }
 
         return wrapPluginOptions(pluginOptions, "configuration")