commit 73968beb892091e38d611e4ca559b8580226c86b
author android-build-team Robot <android-build-team-robot@google.com> Mon Apr 15 16:51:55 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Apr 15 16:51:55 2019 +0000
tree 8be5b41fbff7ff7a1d1964d92a01532d00c8338f
parent 0b8eff12f62b6ccd3d1187bd12fbf739c29e603c
parent 661c183e19d3a6848a046f1db973f5725c7f2204

Snap for 5470312 from 661c183e19d3a6848a046f1db973f5725c7f2204 to qt-release

Change-Id: Iea511bfe68649dae03239320bdcacf6c08bb7c43

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"],
         },
     },