commit 754b27d3ddf29a42b88cc0b2756dd789e83a46e4
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 12 23:36:29 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 12 23:36:29 2019 +0000
tree 66aa9e18199001fcde07a25f484d343997703eff
parent afe44cc483ea5a55822123f3c61229045fb3e81f
parent b061e77748257c598cc63bd290c7de8c98938362

Merge "Link libgcc_stripped into libc.so and libm.so with --whole-archive on ARM."

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 9c2d713..cdbdf63 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1710,6 +1710,8 @@
             strip: {
                 keep_symbols_and_debug_frame: true,
             },
+
+            whole_static_libs: [ "libgcc_stripped" ],
         },
         arm64: {
             version_script: ":libc.arm64.map",

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index bf05b17..de32185 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -286,6 +286,7 @@
             pack_relocations: false,
             ldflags: ["-Wl,--hash-style=both"],
             version_script: ":libm.arm.map",
+            whole_static_libs: [ "libgcc_stripped" ],
         },
 
         arm64: {