commit 7786a344ce17e8f065952afddebb1141f34c43f5
author Yi Kong <yikong@google.com> Fri Aug 31 19:01:56 2018 -0700
committer Yi Kong <yikong@google.com> Wed Oct 03 10:07:13 2018 +0000
tree 11e9a7fc05da7f939b18e27d6570888682cd50b6
parent fc85c3c8476fe2490b027840994db4ff009631e0

Exclude libclang_rt.builtins symbols

Similar to libgcc, libclang_rt.builtins symbols need to be excluded.

Bug: 29275768
Change-Id: Iaf7381de3b4dbd92997abd03667dea0baaab98e1

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index b809f76..db379ba 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -244,7 +244,13 @@
     //
     // DO NOT REMOVE --exclude-libs!
 
-    ldflags: ["-Wl,--exclude-libs=libgcc.a"],
+    ldflags: [
+        "-Wl,--exclude-libs=libgcc.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",
+        "-Wl,--exclude-libs=libclang_rt.builtins-x86_64-android.a",
+    ],
 
     // for x86, exclude libgcc_eh.a for the same reasons as above
     arch: {