commit 661c183e19d3a6848a046f1db973f5725c7f2204
author Christopher Ferris <cferris@google.com> Thu Apr 11 00:57:07 2019 +0000
committer Christopher Ferris <cferris@google.com> Thu Apr 11 00:57:07 2019 +0000
tree 8be5b41fbff7ff7a1d1964d92a01532d00c8338f
parent faa5265e0ef02aedb706d58f19f900b37a6ce6cf

Revert "Do not re-export _Unwind_XXX symbols."

This reverts commit faa5265e0ef02aedb706d58f19f900b37a6ce6cf.

Bug: 130267141

Reason for revert: Working on full fix.

Change-Id: I3ab736720f9a5310c42878d757002681e139dcc7

Android.bp

diff --git a/Android.bp b/Android.bp
index 54454a4..01bb51b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,13 +47,7 @@
 
             // TODO: This is to work around b/24465209. Remove after root cause is fixed
             pack_relocations: false,
-            ldflags: [
-                "-Wl,--hash-style=both",
-                // TODO: This works around b/130267141 to avoid re-exporting
-                // _Unwind_XXX symbols and needs to be removed when a
-                // global location for this can be found.
-                "-Wl,--exclude-libs,libgcc.a",
-            ],
+            ldflags: ["-Wl,--hash-style=both"],
         },
     },