From 37b4a152a4444f15b8e6742fad55e0d2ac2d1c73 Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Mon, 3 Oct 2022 14:29:16 -0700
Subject: [PATCH] Do not strip bionic test helpers

Change-Id: I651511cf11d38f8012ddf968dacae530e7a66d69
---
 tests/libs/Android.bp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index 66a902ec3..0c9a2e089 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -41,6 +41,9 @@ cc_defaults {
             enabled: false,
         },
     },
+    strip: {
+        none: true,
+    },
 }
 
 // -----------------------------------------------------------------------------
@@ -1532,12 +1535,6 @@ cc_test_library {
     host_supported: false,
     defaults: ["bionic_testlib_defaults"],
     srcs: ["relocations.cpp"],
-
-    // Hack to ensure we're using llvm-objcopy because our binutils prebuilt
-    // only supports the old numbers (http://b/141010852).
-    strip: {
-      keep_symbols: true,
-    },
 }
 
 // This is the same encoding as SHT_RELR, but using OS-specific constants.