Merge "Fix darwin build break." am: 1a73e9b7e2

am: 8fc46f7c6c

Change-Id: I4998785bf5d83d26466007b0ded7b0a6523ab33f
This commit is contained in:
Josh Gao 2016-09-14 21:14:03 +00:00 committed by android-build-merger
commit 50ccd9a7aa

View file

@ -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);