commit ad849b6371eafb5f5b198fa42202bed30f5a96df
author Steven Moreland <smoreland@google.com> Mon May 18 17:06:43 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 18 17:06:43 2020 +0000
tree 1f5749ea8c7ff2da2183bbc3f9d4edef4f96d3ee
parent 2804e79b5c9e326b083193b77bfe2e940f829c46
parent 5921fa4151690addc4521d593ac6934aaf14fd91

Merge "libbinder: do not destruct SM global" am: 5921fa4151

Change-Id: Ib230829ed00632d7f2b54885fa4b134dd52cfdd7

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()
 {