From db20c1a38fae5c52ad242c97d3857f991cff9492 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 21 Mar 2018 20:31:30 +0300 Subject: [PATCH] Minor: Add Android Studio platform prefix in Android patchset branches to fix 'runIde' task for them --- buildSrc/src/main/kotlin/intellijDependencies.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/buildSrc/src/main/kotlin/intellijDependencies.kt b/buildSrc/src/main/kotlin/intellijDependencies.kt index 3636b4ff6a9..54c84ca84b1 100644 --- a/buildSrc/src/main/kotlin/intellijDependencies.kt +++ b/buildSrc/src/main/kotlin/intellijDependencies.kt @@ -141,6 +141,10 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File, "-Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" ) + if (rootProject.findProperty("versions.androidStudioRelease") != null) { + jvmArgs("-Didea.platform.prefix=AndroidStudio") + } + if (project.hasProperty("noPCE")) { jvmArgs("-Didea.ProcessCanceledException=disabled") }