From bf150c8dde5ad012b34f4c592eda33249aa165a9 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 26 Nov 2014 16:38:31 +0300
Subject: [PATCH] Disabling Kotlin builder on Android Studio only for Java.

---
 jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
index b5ae442a302..f396d4524e1 100644
--- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
+++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
@@ -85,7 +85,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
 
         val messageCollector = MessageCollectorAdapter(context)
         // Workaround for Android Studio
-        if (!JavaBuilder.IS_ENABLED[context, true]) {
+        if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget()) && !JavaBuilder.IS_ENABLED[context, true]) {
             messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION)
             return NOTHING_DONE
         }