|
@@ -1,6 +1,7 @@
|
|
#!/usr/bin/env python
|
|
#!/usr/bin/env python
|
|
from misc.utility.scons_hints import *
|
|
from misc.utility.scons_hints import *
|
|
|
|
|
|
|
|
+import platform
|
|
import subprocess
|
|
import subprocess
|
|
import sys
|
|
import sys
|
|
|
|
|
|
@@ -51,18 +52,34 @@ lib = env_android.add_shared_library("#bin/libgodot", android_objects, redirect_
|
|
env.Depends(lib, thirdparty_obj)
|
|
env.Depends(lib, thirdparty_obj)
|
|
|
|
|
|
lib_arch_dir = ""
|
|
lib_arch_dir = ""
|
|
|
|
+triple_target_dir = ""
|
|
if env["arch"] == "arm32":
|
|
if env["arch"] == "arm32":
|
|
lib_arch_dir = "armeabi-v7a"
|
|
lib_arch_dir = "armeabi-v7a"
|
|
|
|
+ triple_target_dir = "arm-linux-androideabi"
|
|
elif env["arch"] == "arm64":
|
|
elif env["arch"] == "arm64":
|
|
lib_arch_dir = "arm64-v8a"
|
|
lib_arch_dir = "arm64-v8a"
|
|
|
|
+ triple_target_dir = "aarch64-linux-android"
|
|
elif env["arch"] == "x86_32":
|
|
elif env["arch"] == "x86_32":
|
|
lib_arch_dir = "x86"
|
|
lib_arch_dir = "x86"
|
|
|
|
+ triple_target_dir = "i686-linux-android"
|
|
elif env["arch"] == "x86_64":
|
|
elif env["arch"] == "x86_64":
|
|
lib_arch_dir = "x86_64"
|
|
lib_arch_dir = "x86_64"
|
|
|
|
+ triple_target_dir = "x86_64-linux-android"
|
|
else:
|
|
else:
|
|
print_warning("Architecture not suitable for embedding into APK; keeping .so at \\bin")
|
|
print_warning("Architecture not suitable for embedding into APK; keeping .so at \\bin")
|
|
|
|
|
|
-if lib_arch_dir != "":
|
|
|
|
|
|
+host_subpath = ""
|
|
|
|
+if sys.platform.startswith("linux"):
|
|
|
|
+ host_subpath = "linux-x86_64"
|
|
|
|
+elif sys.platform.startswith("darwin"):
|
|
|
|
+ host_subpath = "darwin-x86_64"
|
|
|
|
+elif sys.platform.startswith("win"):
|
|
|
|
+ if platform.machine().endswith("64"):
|
|
|
|
+ host_subpath = "windows-x86_64"
|
|
|
|
+ else:
|
|
|
|
+ host_subpath = "windows"
|
|
|
|
+
|
|
|
|
+if lib_arch_dir != "" and host_subpath != "":
|
|
if env.dev_build:
|
|
if env.dev_build:
|
|
lib_type_dir = "dev"
|
|
lib_type_dir = "dev"
|
|
elif env.debug_features:
|
|
elif env.debug_features:
|
|
@@ -81,9 +98,7 @@ if lib_arch_dir != "":
|
|
out_dir = "#platform/android/java/lib/libs/" + lib_tools_dir + lib_type_dir + "/" + lib_arch_dir
|
|
out_dir = "#platform/android/java/lib/libs/" + lib_tools_dir + lib_type_dir + "/" + lib_arch_dir
|
|
env_android.CommandNoCache(out_dir + "/libgodot_android.so", lib, Move("$TARGET", "$SOURCE"))
|
|
env_android.CommandNoCache(out_dir + "/libgodot_android.so", lib, Move("$TARGET", "$SOURCE"))
|
|
|
|
|
|
- stl_lib_path = (
|
|
|
|
- str(env["ANDROID_NDK_ROOT"]) + "/sources/cxx-stl/llvm-libc++/libs/" + lib_arch_dir + "/libc++_shared.so"
|
|
|
|
- )
|
|
|
|
|
|
+ stl_lib_path = f"{env['ANDROID_NDK_ROOT']}/toolchains/llvm/prebuilt/{host_subpath}/sysroot/usr/lib/{triple_target_dir}/libc++_shared.so"
|
|
env_android.CommandNoCache(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE"))
|
|
env_android.CommandNoCache(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE"))
|
|
|
|
|
|
def generate_android_binaries(target, source, env):
|
|
def generate_android_binaries(target, source, env):
|
|
@@ -98,10 +113,11 @@ if lib_arch_dir != "":
|
|
else:
|
|
else:
|
|
gradle_process = ["./gradlew"]
|
|
gradle_process = ["./gradlew"]
|
|
|
|
|
|
- gradle_process += [
|
|
|
|
- "generateGodotEditor" if env["target"] == "editor" else "generateGodotTemplates",
|
|
|
|
- "--quiet",
|
|
|
|
- ]
|
|
|
|
|
|
+ if env["target"] == "editor":
|
|
|
|
+ gradle_process += ["generateGodotEditor", "generateGodotHorizonOSEditor", "generateGodotPicoOSEditor"]
|
|
|
|
+ else:
|
|
|
|
+ gradle_process += ["generateGodotTemplates"]
|
|
|
|
+ gradle_process += ["--quiet"]
|
|
|
|
|
|
if env["gradle_do_not_strip"]:
|
|
if env["gradle_do_not_strip"]:
|
|
gradle_process += ["-PdoNotStrip=true"]
|
|
gradle_process += ["-PdoNotStrip=true"]
|