mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84440 from Calinou/scons-android-add-generate-apk-option

Browse Source 
Add `generate_apk=yes` to generate an APK after building
This commit is contained in:
Rémi Verschelde 2023-12-13 10:31:32 +01:00
commit 2966db7d76
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@ -182,6 +182,7 @@ opts.Add(BoolVariable("debug_symbols", "Build with debugging symbols", False))
opts.Add(BoolVariable("separate_debug_symbols", "Extract debugging symbols to a separate file", False))
opts.Add(EnumVariable("lto", "Link-time optimization (production builds)", "none", ("none", "auto", "thin", "full")))
opts.Add(BoolVariable("production", "Set defaults to build Godot for use in production", False))
opts.Add(BoolVariable("generate_apk", "Generate an APK/AAB after building Android library by calling Gradle", False))
# Components
opts.Add(BoolVariable("deprecated", "Enable compatibility code for deprecated and removed features", True))

28
platform/android/SCsub
View File

@ -1,5 +1,7 @@
#!/usr/bin/env python
import subprocess
Import("env")
android_files = [
@ -77,3 +79,29 @@ if lib_arch_dir != "":
str(env["ANDROID_NDK_ROOT"]) + "/sources/cxx-stl/llvm-libc++/libs/" + lib_arch_dir + "/libc++_shared.so"
)
env_android.Command(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE"))
def generate_apk(target, source, env):
if env["target"] != "editor" and env["dev_build"]:
subprocess.run(
[
"./gradlew",
"generateDevTemplate",
"--quiet",
],
cwd="platform/android/java",
)
else:
# Android editor with `dev_build=yes` is handled by the `generateGodotEditor` task.
subprocess.run(
[
"./gradlew",
"generateGodotEditor" if env["target"] == "editor" else "generateGodotTemplates",
"--quiet",
],
cwd="platform/android/java",
)
if env["generate_apk"]:
generate_apk_command = env_android.Command("generate_apk", [], generate_apk)
command = env_android.AlwaysBuild(generate_apk_command)
env_android.Depends(command, [lib])