godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92176 from emrekultursay/master 

Fix detecting when Gradle is invoked from Studio
This commit is contained in:
Rémi Verschelde 2024-05-21 11:23:08 +02:00
parent 365d25de3e 3b8d0bee4a
commit 0e39ac6ac6
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/java/app/config.gradle
View File

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

5
platform/android/java/build.gradle
View File

@ -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')