godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Fix Android build files joining paths without join

Browse Source
This commit is contained in:
Adam Scott
2025-06-09 10:37:54 -04:00
parent 8f87e60307
commit 026ba0dbbc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/android/detect.py
View File

@@ -63,7 +63,7 @@ def get_min_sdk_version(platform):
def get_android_ndk_root(env: "SConsEnvironment"): def get_android_ndk_root(env: "SConsEnvironment"):
return env["ANDROID_HOME"] + "/ndk/" + get_ndk_version() return os.path.join(env["ANDROID_HOME"], "ndk", get_ndk_version())
# This is kept in sync with the value in 'platform/android/java/app/config.gradle'. # This is kept in sync with the value in 'platform/android/java/app/config.gradle'.
@@ -90,7 +90,7 @@ def install_ndk_if_needed(env: "SConsEnvironment"):
sdk_root = env["ANDROID_HOME"] sdk_root = env["ANDROID_HOME"]
if not os.path.exists(get_android_ndk_root(env)): if not os.path.exists(get_android_ndk_root(env)):
extension = ".bat" if os.name == "nt" else "" extension = ".bat" if os.name == "nt" else ""
sdkmanager = sdk_root + "/cmdline-tools/latest/bin/sdkmanager" + extension sdkmanager = os.path.join(sdk_root, "cmdline-tools", "latest", "bin", "sdkmanager" + extension)
if os.path.exists(sdkmanager): if os.path.exists(sdkmanager):
# Install the Android NDK # Install the Android NDK
print("Installing Android NDK...") print("Installing Android NDK...")
@@ -175,14 +175,14 @@ def configure(env: "SConsEnvironment"):
else: else:
host_subpath = "windows" host_subpath = "windows"
toolchain_path = ndk_root + "/toolchains/llvm/prebuilt/" + host_subpath toolchain_path = os.path.join(ndk_root, "toolchains", "llvm", "prebuilt", host_subpath)
compiler_path = toolchain_path + "/bin" compiler_path = os.path.join(toolchain_path, "bin")
env["CC"] = compiler_path + "/clang" env["CC"] = os.path.join(compiler_path, "clang")
env["CXX"] = compiler_path + "/clang++" env["CXX"] = os.path.join(compiler_path, "clang++")
env["AR"] = compiler_path + "/llvm-ar" env["AR"] = os.path.join(compiler_path, "llvm-ar")
env["RANLIB"] = compiler_path + "/llvm-ranlib" env["RANLIB"] = os.path.join(compiler_path, "llvm-ranlib")
env["AS"] = compiler_path + "/clang" env["AS"] = os.path.join(compiler_path, "clang")
env.Append( env.Append(
CCFLAGS=(["-fpic", "-ffunction-sections", "-funwind-tables", "-fstack-protector-strong", "-fvisibility=hidden"]) CCFLAGS=(["-fpic", "-ffunction-sections", "-funwind-tables", "-fstack-protector-strong", "-fvisibility=hidden"])