aboutsummaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
Diffstat (limited to 'libc')
-rw-r--r--libc/Android.bp9
1 files changed, 9 insertions, 0 deletions
diff --git a/libc/Android.bp b/libc/Android.bp
index 8a5b2d997..1bced2e76 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1668,11 +1668,14 @@ cc_library {
ldflags: ["-Wl,--hash-style=both"],
version_script: ":libc.arm.map",
+ no_libcrt: true,
shared: {
srcs: [":libc_sources_shared_arm"],
// 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"],
},
// Arm 32 bit does not produce complete exidx unwind information
@@ -1698,6 +1701,12 @@ cc_library {
ldflags: ["-Wl,--hash-style=both"],
version_script: ":libc.x86.map",
+ no_libcrt: true,
+
+ shared: {
+ // For backwards-compatibility, some x86 builtins are exported from libc.so.
+ static_libs: ["libclang_rt.builtins-i686-android-exported"],
+ },
// Leave the symbols in the shared library so that stack unwinders can produce
// meaningful name resolution.