diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-01 09:55:15 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-01 09:55:15 +0200 |
| commit | 9824a9003f829bf5536ba17dab296e18fbbd25d5 (patch) | |
| tree | 9750c6b47ec9bdb922556393459d927af74356ff /platform | |
| parent | 9ff72fa137191ed003af2932156041f118c52f4f (diff) | |
| parent | cc0d5a43cc8b91b9965a2078bfcc60363e029288 (diff) | |
| download | redot-engine-9824a9003f829bf5536ba17dab296e18fbbd25d5.tar.gz | |
Merge pull request #91339 from TCROC/windows-apk-build-fix
Fix for Android build on Windows
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/SCsub | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index 7380511d6d..4d76ffb180 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys import subprocess 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")) 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"]: subprocess.run( - [ - "./gradlew", + gradle_process + + [ "generateDevTemplate", "--quiet", ], @@ -94,8 +106,8 @@ if lib_arch_dir != "": else: # Android editor with `dev_build=yes` is handled by the `generateGodotEditor` task. subprocess.run( - [ - "./gradlew", + gradle_process + + [ "generateGodotEditor" if env["target"] == "editor" else "generateGodotTemplates", "--quiet", ], |