Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd5872e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "base: dlopen/dlsym for liblog when SDK_VER <= 29" into rvc-dev am:... 

Merge "base: dlopen/dlsym for liblog when SDK_VER <= 29" into rvc-dev am: 2e46b62e am: 4cb0a455 am: 906c2ffd

Change-Id: I0846c2ce38a62ea8701b929a1915ff3f6cab6308
parents f954c1aa 906c2ffd

base/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -70,10 +70,6 @@ cc_defaults { 
        "test_utils.cpp",

    ],



    static: {

        cflags: ["-DNO_LIBLOG_DLSYM"],

    },



    cppflags: ["-Wexit-time-destructors"],

    shared_libs: ["liblog"],

    target: {

base/liblog_symbols.cpp

+1 −3
Original line number Diff line number Diff line
@@ -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>