Merge "liblog: don't destroy global mutexes" am: 0962561c9b am: ffb8945e59
Change-Id: I255d3293ceeb42c3b5fd255f3bf5b65f655a7df6
diff --git a/liblog/Android.bp b/liblog/Android.bp
index de0c636..bab57c0 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -95,7 +95,10 @@
},
},
- header_libs: ["liblog_headers"],
+ header_libs: [
+ "libbase_headers",
+ "liblog_headers",
+ ],
export_header_lib_headers: ["liblog_headers"],
stubs: {
diff --git a/liblog/fake_log_device.cpp b/liblog/fake_log_device.cpp
index fb3b9bc..2ec6393 100644
--- a/liblog/fake_log_device.cpp
+++ b/liblog/fake_log_device.cpp
@@ -31,6 +31,7 @@
#include <mutex>
+#include <android-base/no_destructor.h>
#include <android/log.h>
#include <log/log_id.h>
#include <log/logprint.h>
@@ -72,7 +73,7 @@
} LogState;
static LogState log_state;
-static std::mutex fake_log_mutex;
+static android::base::NoDestructor<std::mutex> fake_log_mutex;
/*
* Configure logging based on ANDROID_LOG_TAGS environment variable. We
@@ -457,7 +458,7 @@
* Also guarantees that only one thread is in showLog() at a given
* time (if it matters).
*/
- auto lock = std::lock_guard{fake_log_mutex};
+ auto lock = std::lock_guard{*fake_log_mutex};
if (!log_state.initialized) {
InitializeLogStateLocked();
@@ -519,7 +520,7 @@
* help debug HOST tools ...
*/
static void FakeClose() {
- auto lock = std::lock_guard{fake_log_mutex};
+ auto lock = std::lock_guard{*fake_log_mutex};
memset(&log_state, 0, sizeof(log_state));
}