Merge pull request godotengine#92176 from emrekultursay/master

Fix detecting when Gradle is invoked from Studio
wiseblank · May 21, 2024 · 0e39ac6 · 0e39ac6
2 parents 365d25d + 3b8d0be
commit 0e39ac6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle
@@ -330,8 +330,7 @@ ext.getReleaseKeyAlias = { ->
 }
 
 ext.isAndroidStudio = { ->
-    def sysProps = System.getProperties()
-    return sysProps != null && sysProps['idea.platform.prefix'] != null
+    return project.hasProperty('android.injected.invoked.from.ide')
 }
 
 ext.shouldZipAlign = { ->

diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
@@ -232,11 +232,6 @@ def generateBuildTasks(String flavor = "template") {
     return tasks
 }
 
-def isAndroidStudio() {
-    def sysProps = System.getProperties()
-    return sysProps != null && sysProps['idea.platform.prefix'] != null
-}
-
 task copyEditorReleaseApkToBin(type: Copy) {
     dependsOn ':editor:assembleRelease'
     from('editor/build/outputs/apk/release')