commit b4229e9051918478e74e79251ec2f5e172d751e6
author Steven Moreland <smoreland@google.com> Mon May 18 17:27:02 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 18 17:27:02 2020 +0000
tree db8653fa08e892226785a5c83a8c4ea561d38fc1
parent 4db659e8d9e51aa5d68884e051e8135070efd42c
parent ad849b6371eafb5f5b198fa42202bed30f5a96df

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

Change-Id: I320aa295fd25b3d8248f85280376f1f49e550b6b

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