diff options
| author | Emre Kultursay <emrekultursay@google.com> | 2024-05-20 14:20:17 -0700 |
|---|---|---|
| committer | Emre Kultursay <emrekultursay@google.com> | 2024-05-20 17:02:36 -0700 |
| commit | 3b8d0bee4a94a9cc715a71458c9d1ec8aafcbd0e (patch) | |
| tree | 920c23f0676882d73fee63dc3d429cfbf089fe8d /platform/android/java | |
| parent | 40b4130c93d08235a60996d29e5869a22b6ae53d (diff) | |
| download | redot-engine-3b8d0bee4a94a9cc715a71458c9d1ec8aafcbd0e.tar.gz | |
Fix detecting when Gradle is invoked from Studio
The existing 'idea.platform.prefix' system-property approach
only worked because of a Android Studio bug that leaks the
system properties from Android Studio into Gradle build:
- https://issuetracker.google.com/201075423
This bug was fixed in Android Studio 2023.3.1 (Jellyfish).
The correct way of identifying builds from Android Studio is to
use the following project property (not system property):
- android.injected.invoked.from.ide
Diffstat (limited to 'platform/android/java')
| -rw-r--r-- | platform/android/java/app/config.gradle | 3 | ||||
| -rw-r--r-- | platform/android/java/build.gradle | 5 |
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') |