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

Commit 846d1479 authored by Jiyong Park's avatar Jiyong Park Committed by Android (Google) Code Review
Browse files

Merge changes from topic "liblog" into rvc-dev 

* changes:
  Whole static link libasync_safe to libbacktrace.a
  libbase uses liblog symbols via dlsym when it is built for APEX
parents 8c6d98af 7c8e2b24

base/liblog_symbols.cpp

+8 −2
Original line number Diff line number Diff line
@@ -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 <dlfcn.h>

#endif



namespace android {

namespace base {



#if defined(__ANDROID__) && !defined(NO_LIBLOG_DLSYM)

#ifdef USE_DLSYM



const std::optional<LibLogFunctions>& GetLibLogFunctions() {

  static std::optional<LibLogFunctions> liblog_functions = []() -> std::optional<LibLogFunctions> {

libbacktrace/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ cc_library { 
        },

        android: {

            static_libs: ["libasync_safe"],

            static: {

                whole_static_libs: ["libasync_safe"],

            },

        },

        vendor: {

            cflags: ["-DNO_LIBDEXFILE_SUPPORT"],