Revert "Do not re-export _Unwind_XXX symbols."android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release

This reverts commit faa5265e0ef02aedb706d58f19f900b37a6ce6cf.

Bug: 130267141

Reason for revert: Working on full fix.

Change-Id: I3ab736720f9a5310c42878d757002681e139dcc7

1 files changed, 1 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 54454a4..01bb51b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,13 +47,7 @@ cc_library {
 
             // 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"],
         },
     },