Merge "Fix darwin build break." am: 1a73e9b7e2 am: 8fc46f7c6c am: 50ccd9a7aa
am: 4f54f18249
Change-Id: Ib75ae41b71307f82cc787a8c0835c89c6b1a2841
diff --git a/base/quick_exit.cpp b/base/quick_exit.cpp
index d9fba03..fa67122 100644
--- a/base/quick_exit.cpp
+++ b/base/quick_exit.cpp
@@ -26,8 +26,8 @@
namespace android {
namespace base {
-static std::mutex quick_exit_mutex;
-static std::vector<void(*)()> quick_exit_handlers;
+static auto& quick_exit_mutex = *new std::mutex();
+static auto& quick_exit_handlers = *new std::vector<void (*)()>();
void quick_exit(int exit_code) {
std::lock_guard<std::mutex> lock(quick_exit_mutex);