summaryrefslogtreecommitdiffstats
path: root/platform/android/java
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-05-21 11:23:08 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-05-21 11:23:08 +0200
commit0e39ac6ac6378f8ef55229e4d9448833f67616b5 (patch)
treef49e5e8ab7bce3c9b11e82e6c194353f59271d4c /platform/android/java
parent365d25de3e7e870dccc66b5b11b678476e1aac41 (diff)
parent3b8d0bee4a94a9cc715a71458c9d1ec8aafcbd0e (diff)
downloadredot-engine-0e39ac6ac6378f8ef55229e4d9448833f67616b5.tar.gz
Merge pull request #92176 from emrekultursay/master
Fix detecting when Gradle is invoked from Studio
Diffstat (limited to 'platform/android/java')
-rw-r--r--platform/android/java/app/config.gradle3
-rw-r--r--platform/android/java/build.gradle5
2 files changed, 1 insertions, 7 deletions
diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle
index d27e75b07a..c404af34d8 100644
--- 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
index c609b33ef4..b91b023ce6 100644
--- 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')