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

This commit is contained in:
Colin Cross 2022-03-08 06:51:43 +00:00 committed by Gerrit Code Review
commit 471bef4d34
2 changed files with 3 additions and 3 deletions

View file

@ -1724,7 +1724,7 @@ cc_library {
// special for arm // special for arm
cflags: ["-DCRT_LEGACY_WORKAROUND"], cflags: ["-DCRT_LEGACY_WORKAROUND"],
// For backwards-compatibility, some arm32 builtins are exported from libc.so. // 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 // Arm 32 bit does not produce complete exidx unwind information
@ -1754,7 +1754,7 @@ cc_library {
shared: { shared: {
// For backwards-compatibility, some x86 builtins are exported from libc.so. // 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 // Leave the symbols in the shared library so that stack unwinders can produce

View file

@ -307,7 +307,7 @@ cc_library {
no_libcrt: true, no_libcrt: true,
shared: { shared: {
// For backwards-compatibility, some arm32 builtins are exported from libm.so. // 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"],
}, },
}, },