Browse Source

Merge pull request #92176 from emrekultursay/master

Fix detecting when Gradle is invoked from Studio
Rémi Verschelde 1 year ago
parent
commit
0e39ac6ac6
2 changed files with 1 additions and 7 deletions
  1. 1 2
      platform/android/java/app/config.gradle
  2. 0 5
      platform/android/java/build.gradle

+ 1 - 2
platform/android/java/app/config.gradle

@@ -330,8 +330,7 @@ ext.getReleaseKeyAlias = { ->
 }
 }
 
 
 ext.isAndroidStudio = { ->
 ext.isAndroidStudio = { ->
-    def sysProps = System.getProperties()
-    return sysProps != null && sysProps['idea.platform.prefix'] != null
+    return project.hasProperty('android.injected.invoked.from.ide')
 }
 }
 
 
 ext.shouldZipAlign = { ->
 ext.shouldZipAlign = { ->

+ 0 - 5
platform/android/java/build.gradle

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