Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-09-20 14:32:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #92176 from emrekultursay/master

Browse Source 
Fix detecting when Gradle is invoked from Studio
This commit is contained in:
Rémi Verschelde 2024-05-21 11:23:08 +02:00
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 = { ->
def sysProps = System.getProperties()
return sysProps != null && sysProps['idea.platform.prefix'] != null
return project.hasProperty('android.injected.invoked.from.ide')
}
ext.shouldZipAlign = { ->

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

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