__cfi_slowpath[_diag] are available to NDK and VNDK clients
When a vendor lib (or vendor-available platform lib) is built with
sanitizer on, __cfi_slowpath_diag is required. However, when building
for those libs, the llndk stub of libdl.so is provided for them and
__cfi_slowpath_diag is not exposed to the stub. In order to make the
sanitizing build successful, expose the symbol.
These symbols are also exposed to NDK clients since we may want to CFI
for unbundled apps.
Bug: 63053790
Bug: 63342219
Test: BOARD_VNDK_VERSION=current m -j libstagefright_foundation.vendor
Change-Id: I081deddb4f66354aaecec4b395d4e17e5566c578
diff --git a/libdl/libdl.arm.map b/libdl/libdl.arm.map
index 668f008..292bd97 100644
--- a/libdl/libdl.arm.map
+++ b/libdl/libdl.arm.map
@@ -34,11 +34,15 @@
dlvsym; # introduced=24
} LIBC;
+LIBC_OMR1 { # future
+ global:
+ __cfi_slowpath; # future
+ __cfi_slowpath_diag; # future
+} LIBC_N;
+
LIBC_PLATFORM {
global:
__cfi_init;
- __cfi_slowpath;
- __cfi_slowpath_diag;
android_dlwarning;
android_get_application_target_sdk_version;
android_set_application_target_sdk_version;
@@ -48,4 +52,4 @@
android_create_namespace;
android_link_namespaces;
android_get_exported_namespace;
-} LIBC_N;
+} LIBC_OMR1;