commit cdb6003784b1c4200cc325f3becce7660f3f171f
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 18 16:05:54 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 18 16:05:54 2020 +0000
tree 8420aeaec4d090f9d2d5bd10ac3d72530d7cd899
parent b962d6bee5a225a6bcd3e8da2f80951598bc98f6
parent 2d954136fa15f78f06792ffe8dc096d7ad018d10

Merge "base: dlopen/dlsym for liblog when SDK_VER <= 29"

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index 12de3b2..894ad6c 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -74,10 +74,6 @@
         "test_utils.cpp",
     ],
 
-    static: {
-        cflags: ["-DNO_LIBLOG_DLSYM"],
-    },
-
     cppflags: ["-Wexit-time-destructors"],
     shared_libs: ["liblog"],
     target: {

base/liblog_symbols.cpp

diff --git a/base/liblog_symbols.cpp b/base/liblog_symbols.cpp
index 8d59179..ba4c161 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 <dlfcn.h>