From 45f0aefb36a9e183d6d9b2ebec28008d94fe51dc Mon Sep 17 00:00:00 2001
From: Santiago Aboy Solanes <solanes@google.com>
Date: Wed, 5 Feb 2025 15:43:22 +0000
Subject: Keep the symbols for host to symbolize crash stack traces

Starting from http://r.android.com/3460147 the symbols are
stripped by default. Re-add them for ART.

Remove the linux_bionic case as it is already covered by host now.

Bug: 394277734
Bug: 390471378
Test: Trigger a crash on purpose and see the full stack trace
Change-Id: Ie7c27ea11371af8e545a63ebb3c6cb0d9a249964
---
 build/Android.bp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/build/Android.bp b/build/Android.bp
index e8a0b5424b..17f6891c1b 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -177,13 +177,6 @@ art_global_defaults {
             // `--exclude-libs` flag is not supported on windows/darwin.
             ldflags: ["-Wl,--exclude-libs=libziparchive.a"],
         },
-        linux_bionic: {
-            strip: {
-                // Do not strip art libs when building for linux-bionic.
-                // Otherwise we can't get any symbols out of crashes.
-                none: true,
-            },
-        },
         darwin: {
             enabled: false,
         },
@@ -200,6 +193,10 @@ art_global_defaults {
                 // clang/libunwind bugs that cause SEGVs in run-test-004-ThreadStress.
                 "-fno-omit-frame-pointer",
             ],
+            // Keep the symbols for host to symbolize crash stack traces.
+            strip: {
+                none: true,
+            },
         },
         // The build assumes that all our x86/x86_64 hosts (such as buildbots and developer
         // desktops) support at least sse4.2/popcount. This firstly implies that the ART
-- 
cgit v1.2.3-59-g8ed1b