Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the build logic to generate the native debug symbols

Browse source
This commit is contained in:
Fredia Huya-Kouadio 2025-06-20 17:03:43 -07:00
parent 53be3b78d1
commit c376348b16
6 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platform/android/SCsub
View file

@ -97,12 +97,21 @@ if lib_arch_dir != "" and host_subpath != "":
else:
lib_tools_dir = ""
out_dir = "#platform/android/java/lib/libs/" + lib_tools_dir + lib_type_dir + "/" + lib_arch_dir
jni_libs_dir = "#platform/android/java/lib/libs/" + lib_tools_dir + lib_type_dir + "/"
out_dir = jni_libs_dir + lib_arch_dir
env_android.CommandNoCache(out_dir + "/libgodot_android.so", lib, Move("$TARGET", "$SOURCE"))
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"))
if env["debug_symbols"] and env["separate_debug_symbols"]:
debug_symbols_zip_file = (
("#bin/android-editor-" if env.editor_build else "#bin/android-template-")
+ lib_type_dir
+ "-native-symbols.zip"
)
env_android.NoCache(Zip(debug_symbols_zip_file, jni_libs_dir, ZIPROOT=Dir(jni_libs_dir)))
if env["generate_android_binaries"]:
env_android.AlwaysBuild(
env_android.CommandNoCache(

8
platform/android/java/app/build.gradle
View file

@ -101,7 +101,7 @@ android {
}
ndk {
debugSymbolLevel 'FULL'
debugSymbolLevel 'NONE'
String[] export_abi_list = getExportEnabledABIs()
abiFilters export_abi_list
}
@ -127,9 +127,11 @@ android {
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
// 'doNotStrip' is enabled for development within Android Studio
// Debug symbols are kept for development within Android Studio.
if (shouldNotStrip()) {
doNotStrip '**/*.so'
jniLibs {
keepDebugSymbols += '**/*.so'
}
}
// Always select Godot's version of libc++_shared.so in case deps have their own

22
platform/android/java/build.gradle
View file

@ -176,10 +176,6 @@ def generateBuildTasks(String flavor = "template", String edition = "standard",
from("app/build/outputs/apk/${edition}/${target}") {
include("android_${filenameSuffix}.apk")
}
from("app/build/outputs/native-debug-symbols/${edition}${capitalizedTarget}") {
include("native-debug-symbols.zip")
rename ("native-debug-symbols.zip", "android-template-${edition}-${target}-native-debug-symbols.zip")
}
into(binDir)
}
}
@ -194,10 +190,6 @@ def generateBuildTasks(String flavor = "template", String edition = "standard",
from("editor/build/outputs/apk/${androidDistro}/${target}") {
include("android_editor-${androidDistro}-${target}*.apk")
}
from("editor/build/outputs/native-debug-symbols/${androidDistro}${capitalizedTarget}") {
include("native-debug-symbols.zip")
rename ("native-debug-symbols.zip", "android-editor-${androidDistro}-${target}-native-debug-symbols.zip")
}
into(androidEditorBuildsDir)
}
}
@ -323,17 +315,11 @@ task cleanGodotTemplates(type: Delete) {
// Delete the Godot templates in the Godot bin directory
delete("$binDir/android_debug.apk")
delete("$binDir/android-template-standard-debug-native-debug-symbols.zip")
delete("$binDir/android_dev.apk")
delete("$binDir/android-template-standard-dev-native-debug-symbols.zip")
delete("$binDir/android_release.apk")
delete("$binDir/android-template-standard-release-native-debug-symbols.zip")
delete("$binDir/android_monoDebug.apk")
delete("$binDir/android-template-mono-debug-native-debug-symbols.zip")
delete("$binDir/android_monoDev.apk")
delete("$binDir/android-template-mono-dev-native-debug-symbols.zip")
delete("$binDir/android_monoRelease.apk")
delete("$binDir/android-template-mono-release-native-debug-symbols.zip")
delete("$binDir/android_source.zip")
delete("$binDir/godot-lib.template_debug.aar")
delete("$binDir/godot-lib.template_debug.dev.aar")
@ -343,4 +329,12 @@ task cleanGodotTemplates(type: Delete) {
delete("$binDir/godot-lib.debug.aar")
delete("$binDir/godot-lib.dev.aar")
delete("$binDir/godot-lib.release.aar")
// Delete the native debug symbols files.
delete("$binDir/android-editor-debug-native-symbols.zip")
delete("$binDir/android-editor-dev-native-symbols.zip")
delete("$binDir/android-editor-release-native-symbols.zip")
delete("$binDir/android-template-debug-native-symbols.zip")
delete("$binDir/android-template-dev-native-symbols.zip")
delete("$binDir/android-template-release-native-symbols.zip")
}

8
platform/android/java/editor/build.gradle
View file

@ -90,7 +90,7 @@ android {
editorBuildSuffix: ""
]
ndk { debugSymbolLevel 'FULL' }
ndk { debugSymbolLevel 'NONE' }
}
base {
@ -141,9 +141,11 @@ android {
}
packagingOptions {
// 'doNotStrip' is enabled for development within Android Studio
// Debug symbols are kept for development within Android Studio.
if (shouldNotStrip()) {
doNotStrip '**/*.so'
jniLibs {
keepDebugSymbols += '**/*.so'
}
}
}

6
platform/android/java/lib/build.gradle
View file

@ -67,9 +67,11 @@ android {
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
// 'doNotStrip' is enabled for development within Android Studio
// Debug symbols are kept for development within Android Studio.
if (shouldNotStrip()) {
doNotStrip '**/*.so'
jniLibs {
keepDebugSymbols += '**/*.so'
}
}
}

5
platform/android/platform_android_builders.py
View file

@ -19,7 +19,10 @@ def generate_android_binaries(target, source, env):
if env["target"] == "editor":
gradle_process += ["generateGodotEditor", "generateGodotHorizonOSEditor", "generateGodotPicoOSEditor"]
else:
gradle_process += ["generateGodotTemplates"]
if env["module_mono_enabled"]:
gradle_process += ["generateGodotMonoTemplates"]
else:
gradle_process += ["generateGodotTemplates"]
gradle_process += ["--quiet"]
if env["debug_symbols"] and not env["separate_debug_symbols"]: