as31: Kotlin Facet: Configure facet based on Android build variant (in AS)

#KT-19958 Fixed

idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidModuleSetupStep.kt.as31

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.android.configure
+
+import com.android.tools.idea.gradle.project.model.AndroidModuleModel
+import com.android.tools.idea.gradle.project.sync.setup.post.ModuleSetupStep
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.progress.ProgressIndicator
+import org.jetbrains.android.facet.AndroidFacet
+import org.jetbrains.kotlin.idea.configuration.compilerArgumentsBySourceSet
+import org.jetbrains.kotlin.idea.configuration.configureFacetByCompilerArguments
+import org.jetbrains.kotlin.idea.configuration.sourceSetName
+import org.jetbrains.kotlin.idea.facet.KotlinFacet
+
+class KotlinAndroidModuleSetupStep : ModuleSetupStep() {
+    override fun setUpModule(module: Module, progressIndicator: ProgressIndicator?) {
+        val facet = AndroidFacet.getInstance(module) ?: return
+        val androidModel = AndroidModuleModel.get(facet) ?: return
+        val sourceSetName = androidModel.selectedVariant.name
+        if (module.sourceSetName == sourceSetName) return
+        val argsInfo = module.compilerArgumentsBySourceSet?.get(sourceSetName) ?: return
+        val kotlinFacet = KotlinFacet.get(module) ?: return
+        module.sourceSetName = sourceSetName
+        configureFacetByCompilerArguments(kotlinFacet, argsInfo, null)
+    }
+}

idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinGradleAndroidModuleModelProjectDataService.kt.as31

@@ -46,7 +46,8 @@ class KotlinGradleAndroidModuleModelProjectDataService : AbstractProjectDataServ
             val moduleNode = ExternalSystemApiUtil.findParent(moduleModelNode, ProjectKeys.MODULE) ?: continue
             val moduleData = moduleNode.data
             val ideModule = modelsProvider.findIdeModule(moduleData) ?: continue
-            val kotlinFacet = configureFacetByGradleModule(moduleNode, null, ideModule, modelsProvider) ?: continue
+            val sourceSetName = moduleModelNode.data.selectedVariant.name
+            val kotlinFacet = configureFacetByGradleModule(moduleNode, sourceSetName, ideModule, modelsProvider) ?: continue
             GradleProjectImportHandler.getInstances(project).forEach { it.importByModule(kotlinFacet, moduleNode) }
         }
     }