Skip to content

Commit

Permalink
Fix detecting when Gradle is invoked from Studio
Browse files Browse the repository at this point in the history
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
  • Loading branch information
emrekultursay committed May 21, 2024
1 parent 40b4130 commit 3b8d0be
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
3 changes: 1 addition & 2 deletions platform/android/java/app/config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = { ->
Expand Down
5 changes: 0 additions & 5 deletions platform/android/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 3b8d0be

Please sign in to comment.