ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from topic "liblog" into rvc-dev

Browse source 
* changes:
  Whole static link libasync_safe to libbacktrace.a
  libbase uses liblog symbols via dlsym when it is built for APEX
This commit is contained in:
Jiyong Park 2020-03-11 03:25:29 +00:00 • committed by Android (Google) Code Review
commit 846d14799b
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/liblog_symbols.cpp
View file

@ -16,14 +16,20 @@
#include "liblog_symbols.h" #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> #include <dlfcn.h>
#endif #endif
namespace android { namespace android {
namespace base { namespace base {
#if defined(__ANDROID__) && !defined(NO_LIBLOG_DLSYM) #ifdef USE_DLSYM
const std::optional<LibLogFunctions>& GetLibLogFunctions() { const std::optional<LibLogFunctions>& GetLibLogFunctions() {
static std::optional<LibLogFunctions> liblog_functions = []() -> std::optional<LibLogFunctions> { static std::optional<LibLogFunctions> liblog_functions = []() -> std::optional<LibLogFunctions> {

3
libbacktrace/Android.bp
View file

@ -89,6 +89,9 @@ cc_library {
}, },
android: { android: {
static_libs: ["libasync_safe"], static_libs: ["libasync_safe"],
static: {
whole_static_libs: ["libasync_safe"],
},
}, },
vendor: { vendor: {
cflags: ["-DNO_LIBDEXFILE_SUPPORT"], cflags: ["-DNO_LIBDEXFILE_SUPPORT"],