commit 471bef4d34a666a5edfb2c0008dad89b6c6f1d76
author Colin Cross <ccross@android.com> Tue Mar 08 06:51:43 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 08 06:51:43 2022 +0000
tree 78d8442db21c20331c5f66aa98ff39e821b7f568
parent 5fbda5b808e807f33e33221a0e4a8e9e2d614f66
parent 335e27b740026af15d187ab39666b077dca7a7f7

Merge "Use single module for libclang_rt.builtins-exported"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 1c4876e..7175c77 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1724,7 +1724,7 @@
                 // special for arm
                 cflags: ["-DCRT_LEGACY_WORKAROUND"],
                 // For backwards-compatibility, some arm32 builtins are exported from libc.so.
-                static_libs: ["libclang_rt.builtins-arm-android-exported"],
+                static_libs: ["libclang_rt.builtins-exported"],
             },
 
             // Arm 32 bit does not produce complete exidx unwind information
@@ -1754,7 +1754,7 @@
 
             shared: {
                 // For backwards-compatibility, some x86 builtins are exported from libc.so.
-                static_libs: ["libclang_rt.builtins-i686-android-exported"],
+                static_libs: ["libclang_rt.builtins-exported"],
             },
 
             // Leave the symbols in the shared library so that stack unwinders can produce

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index 43d82d5..5622e8c 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -307,7 +307,7 @@
             no_libcrt: true,
             shared: {
                 // For backwards-compatibility, some arm32 builtins are exported from libm.so.
-                static_libs: ["libclang_rt.builtins-arm-android-exported"],
+                static_libs: ["libclang_rt.builtins-exported"],
             },
         },