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

2019-11-12 23:36:29 +00:00 · 2019-11-12 23:36:29 +00:00 · 754b27d3dd
commit 754b27d3dd
parent afe44cc483 b061e77748
2 changed files with 3 additions and 0 deletions
--- a/libc/Android.bp
+++ b/libc/Android.bp
@ -1710,6 +1710,8 @@ cc_library {
            strip: {
                keep_symbols_and_debug_frame: true,
            },
+
+            whole_static_libs: [ "libgcc_stripped" ],
        },
        arm64: {
            version_script: ":libc.arm64.map",
--- a/libm/Android.bp
+++ b/libm/Android.bp
@ -286,6 +286,7 @@ cc_library {
            pack_relocations: false,
            ldflags: ["-Wl,--hash-style=both"],
            version_script: ":libm.arm.map",
+            whole_static_libs: [ "libgcc_stripped" ],
        },

        arm64: {