From 2d954136fa15f78f06792ffe8dc096d7ad018d10 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 17 Mar 2020 03:43:03 +0900 Subject: [PATCH] base: dlopen/dlsym for liblog when SDK_VER <= 29 libbase doesn't have to rely on dlopen/dlsym to use liblog's new symbols when it is built for __ANDROID_SDK_VERSION__ > 29. Bug: 150860940 Test: TARGET_BUILD_APPS="com.android.adbd com.android.resolv" m objdump -T ...shared_com.android.resolv/libbase.so | grep LIBLOG_R => should be none because resolv apex is targeting 29 objdump -T ...shared_com.android.adbd/libbase.so | grep LIBLOG_R => should list all new symbols because adbd apex is targeting R objdump -T ...shared/libbase.so | grep LIBLOG_R => should list all new symbols Merged-In: I7f7f16510d7637cd380fe35ea9ff3e804f38851d Change-Id: I7f7f16510d7637cd380fe35ea9ff3e804f38851d (cherry picked from commit 22207e65903ecd486714d66f3970a67a64d85a8f) --- base/Android.bp | 4 ---- base/liblog_symbols.cpp | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/base/Android.bp b/base/Android.bp index 12de3b22c..894ad6c50 100644 --- a/base/Android.bp +++ b/base/Android.bp @@ -74,10 +74,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