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

Merge pull request #91339 from TCROC/windows-apk-build-fix 

Fix for Android build on Windows
This commit is contained in:
Rémi Verschelde 2024-05-01 09:55:15 +02:00
parent 9ff72fa137 cc0d5a43cc
commit 9824a9003f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
platform/android/SCsub
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys
import subprocess import subprocess
from methods import print_warning from methods import print_warning
@ -82,10 +83,21 @@ if lib_arch_dir != "":
env_android.Command(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE")) env_android.Command(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE"))
def generate_apk(target, source, env): def generate_apk(target, source, env):
gradle_process = []
if sys.platform.startswith("win"):
gradle_process = [
"cmd",
"/c",
"gradlew.bat",
]
else:
gradle_process = ["./gradlew"]
if env["target"] != "editor" and env["dev_build"]: if env["target"] != "editor" and env["dev_build"]:
subprocess.run( subprocess.run(
[ gradle_process
"./gradlew", + [
"generateDevTemplate", "generateDevTemplate",
"--quiet", "--quiet",
], ],
@ -94,8 +106,8 @@ if lib_arch_dir != "":
else: else:
# Android editor with `dev_build=yes` is handled by the `generateGodotEditor` task. # Android editor with `dev_build=yes` is handled by the `generateGodotEditor` task.
subprocess.run( subprocess.run(
[ gradle_process
"./gradlew", + [
"generateGodotEditor" if env["target"] == "editor" else "generateGodotTemplates", "generateGodotEditor" if env["target"] == "editor" else "generateGodotTemplates",
"--quiet", "--quiet",
], ],