Merge "Do not strip gdb binary"

1 files changed, 3 insertions, 8 deletions

diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py
index 42efe3b01..d6021ba68 100755
--- a/ndk/checkbuild.py
+++ b/ndk/checkbuild.py
@@ -1240,18 +1240,11 @@ class Gdb(ndk.builds.Module):
         """Returns the lazily initialized gdb builder for this module."""
         if self._gdb_builder is None:
             no_build_or_host = False
-            no_strip = False
             additional_flags = []
             if self.host == ndk.hosts.Host.Darwin:
                 # Awful Darwin hack. For some reason GDB doesn't produce a gdb
                 # executable when using --build/--host.
                 no_build_or_host = True
-                # -s caused mysterious linking error on old macOS like:
-                # "ld: internal error: atom not found in symbolIndex(...)"
-                # Seems old ld64 wrongly stripped some symbols.
-                # Remove this when build server upgrades to xcode 7.3
-                # (ld64-264.3.101) or above.
-                no_strip = True
                 additional_flags.append('-Wl,-rpath,@loader_path/../lib')
             if self.host == ndk.hosts.Host.Linux:
                 additional_flags.append('-Wl,-rpath,$$$$\\ORIGIN/../lib')
@@ -1264,7 +1257,9 @@ class Gdb(ndk.builds.Module):
                 self.host,
                 use_clang=True,
                 no_build_or_host=no_build_or_host,
-                no_strip=no_strip,
+                # Since we statically link libpython, python dynamic libraries may
+                # depend on symbols in gdb binary.
+                no_strip=True,
                 additional_flags=additional_flags)
         return self._gdb_builder