diff --git a/base/liblog_symbols.cpp b/base/liblog_symbols.cpp index d5dfcd28b..8d5917907 100644 --- a/base/liblog_symbols.cpp +++ b/base/liblog_symbols.cpp @@ -16,14 +16,20 @@ #include "liblog_symbols.h" -#if defined(__ANDROID__) && !defined(NO_LIBLOG_DLSYM) +#if defined(__ANDROID__) +#if !defined(NO_LIBLOG_DLSYM) || defined(__ANDROID_APEX__) +#define USE_DLSYM +#endif +#endif + +#ifdef USE_DLSYM #include #endif namespace android { namespace base { -#if defined(__ANDROID__) && !defined(NO_LIBLOG_DLSYM) +#ifdef USE_DLSYM const std::optional& GetLibLogFunctions() { static std::optional liblog_functions = []() -> std::optional { diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp index 565f2c35e..59bd97c25 100644 --- a/libbacktrace/Android.bp +++ b/libbacktrace/Android.bp @@ -89,6 +89,9 @@ cc_library { }, android: { static_libs: ["libasync_safe"], + static: { + whole_static_libs: ["libasync_safe"], + }, }, vendor: { cflags: ["-DNO_LIBDEXFILE_SUPPORT"],