diff --git a/base/Android.bp b/base/Android.bp index 25c74f219..3702b43db 100644 --- a/base/Android.bp +++ b/base/Android.bp @@ -70,10 +70,6 @@ cc_defaults { "test_utils.cpp", ], - static: { - cflags: ["-DNO_LIBLOG_DLSYM"], - }, - cppflags: ["-Wexit-time-destructors"], shared_libs: ["liblog"], target: { diff --git a/base/liblog_symbols.cpp b/base/liblog_symbols.cpp index 8d5917907..ba4c16157 100644 --- a/base/liblog_symbols.cpp +++ b/base/liblog_symbols.cpp @@ -16,11 +16,9 @@ #include "liblog_symbols.h" -#if defined(__ANDROID__) -#if !defined(NO_LIBLOG_DLSYM) || defined(__ANDROID_APEX__) +#if defined(__ANDROID_SDK_VERSION__) && (__ANDROID_SDK_VERSION__ <= 29) #define USE_DLSYM #endif -#endif #ifdef USE_DLSYM #include