From 88177ab59ebf35fb037f3f5505c7bb2e75432c99 Mon Sep 17 00:00:00 2001 From: Enginex0 Date: Wed, 11 Mar 2026 00:45:00 +0100 Subject: [PATCH] build(gradle): keep debug symbols in debug variant Debug ZIPs now ship unstripped native libs sourced from merged_native_libs instead of stripped_native_libs. Gives meaningful stack traces for crash debugging on-device. --- app/build.gradle.kts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 73b1284..ee99bc8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -121,8 +121,8 @@ androidComponents { dependsOn("package${capitalized}") } else { dependsOn("minify${capitalized}WithR8") + dependsOn("strip${capitalized}DebugSymbols") } - dependsOn("strip${capitalized}DebugSymbols") dependsOn(buildRustCertgen) if (isDebug) { @@ -140,12 +140,13 @@ androidComponents { } } - from( - project.layout.buildDirectory.dir( - "intermediates/stripped_native_libs/${variant.name}/strip${capitalized}DebugSymbols/out/lib" - ) - ) { - into("lib") // Place them in the 'lib' subfolder of the staging directory. + val nativeLibsDir = if (isDebug) { + "intermediates/merged_native_libs/${variant.name}/merge${capitalized}NativeLibs/out/lib" + } else { + "intermediates/stripped_native_libs/${variant.name}/strip${capitalized}DebugSymbols/out/lib" + } + from(project.layout.buildDirectory.dir(nativeLibsDir)) { + into("lib") include("**/libinject.so", "**/libTEESimulator.so", "**/libsupervisor.so", "**/libcertgen.so") }