commit 2a24f6bd5f61ee4e916f08a7a69b486891f12f44
author Ryan Prichard <rprichard@google.com> Tue May 07 21:21:08 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 07 21:21:08 2019 +0000
tree 00d8377b3273af0bb9b07e858340673ac5619a82
parent bffe6f16a81d35b54a8c746fa5d3f8bec58c6a87
parent c8e263becfa01afecba84edf6a8a18da27a78e89

Merge "Revert fwalk/sfp locking to fix concurrent reads" into qt-dev

libdl/Android.bp

diff --git a/libdl/Android.bp b/libdl/Android.bp
index b1ee5ab..fbbe7ba 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -47,6 +47,7 @@
 
     ldflags: [
         "-Wl,--exclude-libs=libgcc.a",
+        "-Wl,--exclude-libs=libgcc_stripped.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a",
@@ -127,6 +128,7 @@
 
     ldflags: [
         "-Wl,--exclude-libs=libgcc.a",
+        "-Wl,--exclude-libs=libgcc_stripped.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a",

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index 73328da..728dec5 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -319,6 +319,7 @@
 
     ldflags: [
         "-Wl,--exclude-libs=libgcc.a",
+        "-Wl,--exclude-libs=libgcc_stripped.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a",
         "-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a",