godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases 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

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'
}
}
}