commit 8fece73f64f7caba5eb582a3061bc68224529f08
author Steven Moreland <smoreland@google.com> Mon May 18 18:53:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 18 18:53:17 2020 +0000
tree b7374bc3a579bacdbbd097f1f61a53c3db382372
parent b044315d131cdf0e2ed180779d7f6cc1953add54
parent 4c62ebb6a87721bd719a81b25cd5d56b2f545780

Merge "libbinder: do not destruct SM global" am: 5921fa4151 am: ad849b6371 am: b4229e9051 am: 6a6afa8f3f am: 4c62ebb6a8

Change-Id: I7d7f43342c09de02ab8a760b366767158442e133

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index dab7ad5..01cbd56 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -85,8 +85,8 @@
     sp<AidlServiceManager> mTheRealServiceManager;
 };
 
-static std::once_flag gSmOnce;
-static sp<IServiceManager> gDefaultServiceManager;
+[[clang::no_destroy]] static std::once_flag gSmOnce;
+[[clang::no_destroy]] static sp<IServiceManager> gDefaultServiceManager;
 
 sp<IServiceManager> defaultServiceManager()
 {