From c95afaa20b0a42fd3625efbb9892f64ea653ccf0 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Wed, 14 Sep 2016 13:54:16 -0700
Subject: [PATCH] Fix darwin build break.

Bug: http://b/31468413
Change-Id: I12fdf0977213eefc7043939964070025a672881a
---
 base/quick_exit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/quick_exit.cpp b/base/quick_exit.cpp
index d9fba03d7..fa671224e 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);