From b3877b5f0b44db7d7daf666611516ac2fb729a19 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 23 Dec 2015 16:01:17 +0300
Subject: [PATCH] Always compile Android projects without JDK in classpath
 #KT-10479

---
 .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt    | 1 +
 .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 4 +++-
 .../kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy  | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index b9356ea601d..119a236f5db 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -135,6 +135,7 @@ public open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments
         getLogger().kotlinDebug("args.pluginOptions = ${args.pluginOptions.joinToString(File.pathSeparator)}")
 
         args.noStdlib = true
+        args.noJdk = kotlinOptions.noJdk
         args.noInline = kotlinOptions.noInline
         args.noOptimize = kotlinOptions.noOptimize
         args.noCallAssertions = kotlinOptions.noCallAssertions
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 611d135fe04..dbd743c3e06 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -314,7 +314,9 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
             }
         })
 
-        (ext as ExtensionAware).getExtensions().add("kotlinOptions", tasksProvider.kotlinJVMOptionsClass)
+        val extensions = (ext as ExtensionAware).getExtensions()
+        extensions.add("kotlinOptions", tasksProvider.kotlinJVMOptionsClass)
+        AndroidGradleWrapper.setNoJdk(extensions.getByName("kotlinOptions"))
 
         project.createKaptExtension()
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
index ce9ebc1c45a..774d43716a7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
@@ -63,6 +63,10 @@ class AndroidGradleWrapper {
     return androidSourceSet.getJava().getSrcDirs()
   }
 
+  static def setNoJdk(Object kotlinOptionsExtension) {
+    kotlinOptionsExtension.noJdk = true
+  }
+
   @NotNull
   static def List<String> getProductFlavorsNames(ApkVariant variant) {
       return variant.getProductFlavors().iterator().collect { it.getName() }