From f1aa75fdf81f7c6a9ec2368f9c554417df640df5 Mon Sep 17 00:00:00 2001 From: Aleksei Cherepanov Date: Tue, 29 Sep 2020 11:04:36 +0300 Subject: [PATCH] [JPS] Fix startup environment for Android Studio --- gradle/jps.gradle.kts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index bf2bd488a45..e2ba0d0ab35 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -207,6 +207,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { pluginDir: File, disableProcessCanceledException: Boolean = false ) { + val useAndroidStudio = rootProject.extra.has("versions.androidStudioRelease") application(title) { moduleName = "kotlin.idea-runner.main" workingDirectory = File(intellijRootDir(), "bin").toString() @@ -227,7 +228,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { "-Dapple.awt.graphics.UseQuartz=true", "-Dsun.io.useCanonCaches=false", "-Dplugin.path=${pluginDir.absolutePath}", - "-Didea.ProcessCanceledException=${if (disableProcessCanceledException) "disabled" else "enabled"}" + "-Didea.ProcessCanceledException=${if (disableProcessCanceledException) "disabled" else "enabled"}", + if (useAndroidStudio) "-Didea.platform.prefix=AndroidStudio" else "" ).joinToString(" ") } }