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

libbase: remove exit-time destructors.

Browse source 
Removed for the same reason as the adb exit-time destructors.

Bug: http://b/23384853
Change-Id: Ic124ecb9df132b850a3855e207baffec926dde29
This commit is contained in:
Josh Gao 2015-11-12 11:54:47 -08:00
parent b7b1edf974
commit 7df6b5fc79
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/Android.mk
View file

@ -36,6 +36,12 @@ libbase_cppflags := \
-Wextra \
-Werror \
libbase_linux_cppflags := \
-Wexit-time-destructors \
libbase_darwin_cppflags := \
-Wexit-time-destructors \
# Device
# ------------------------------------------------------------------------------
include $(CLEAR_VARS)
@ -43,7 +49,7 @@ LOCAL_MODULE := libbase
LOCAL_CLANG := true
LOCAL_SRC_FILES := $(libbase_src_files)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CPPFLAGS := $(libbase_cppflags)
LOCAL_CPPFLAGS := $(libbase_cppflags) $(libbase_linux_cppflags)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES := libcutils
LOCAL_MULTILIB := both
@ -66,6 +72,8 @@ LOCAL_MODULE := libbase
LOCAL_SRC_FILES := $(libbase_src_files)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CPPFLAGS := $(libbase_cppflags)
LOCAL_CPPFLAGS_darwin := $(libbase_darwin_cppflags)
LOCAL_CPPFLAGS_linux := $(libbase_linux_cppflags)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES := libcutils
LOCAL_MULTILIB := both

8
base/logging.cpp
View file

@ -127,17 +127,17 @@ class lock_guard {
namespace android {
namespace base {
static mutex logging_lock;
static auto& logging_lock = *new mutex();
#ifdef __ANDROID__
static LogFunction gLogger = LogdLogger();
static auto& gLogger = *new LogFunction(LogdLogger());
#else
static LogFunction gLogger = StderrLogger;
static auto& gLogger = *new LogFunction(StderrLogger);
#endif
static bool gInitialized = false;
static LogSeverity gMinimumLogSeverity = INFO;
static std::unique_ptr<std::string> gProgramInvocationName;
static auto& gProgramInvocationName = *new std::unique_ptr<std::string>();
LogSeverity GetMinimumLogSeverity() {
return gMinimumLogSeverity;