Use single module for libclang_rt.builtins-exported
The clang prebuilts now provide a single module with per-architecture
variants instead of a module per architecture.
Bug: 220019988
Test: m checkbuild
Ignore-AOSP-First: topic contains vendor projects
Change-Id: I079f36f94b13e06d59a16cf665b65db76084021a
Merged-In: I079f36f94b13e06d59a16cf665b65db76084021a
diff --git a/libc/Android.bp b/libc/Android.bp
index f132669..c7b9930 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