[JPS] Fix startup environment for Android Studio
This commit is contained in:
@@ -207,6 +207,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
|||||||
pluginDir: File,
|
pluginDir: File,
|
||||||
disableProcessCanceledException: Boolean = false
|
disableProcessCanceledException: Boolean = false
|
||||||
) {
|
) {
|
||||||
|
val useAndroidStudio = rootProject.extra.has("versions.androidStudioRelease")
|
||||||
application(title) {
|
application(title) {
|
||||||
moduleName = "kotlin.idea-runner.main"
|
moduleName = "kotlin.idea-runner.main"
|
||||||
workingDirectory = File(intellijRootDir(), "bin").toString()
|
workingDirectory = File(intellijRootDir(), "bin").toString()
|
||||||
@@ -227,7 +228,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
|||||||
"-Dapple.awt.graphics.UseQuartz=true",
|
"-Dapple.awt.graphics.UseQuartz=true",
|
||||||
"-Dsun.io.useCanonCaches=false",
|
"-Dsun.io.useCanonCaches=false",
|
||||||
"-Dplugin.path=${pluginDir.absolutePath}",
|
"-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(" ")
|
).joinToString(" ")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user