commit 1698ffd088b9c2e5e601a1c82352c54a338bca32
author Steven Moreland <smoreland@google.com> Fri May 15 23:43:52 2020 +0000
committer Steven Moreland <smoreland@google.com> Sat May 16 00:27:55 2020 +0000
tree 84851ff8557464161ff140524c0f83d940d1c21a
parent dd44f7465d53fe155c03c0b1129c467a1f1c5830

libbinder: do not destruct SM global

Let linux clean it up, since this may be accessed by some threads after
the main thread is destructed.

Bug: 154507808 # longterm
Bug: 156785633

Test: w/ repro which calls defaultServiceManager off main thread
Change-Id: Ic109f4bdca3893e6b0b192ac27f3ff03ada6f9e2

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