Hide global variables
* Move gBn/sConstructorMap into details
* Move gDefaultServiceManager[Lock] into details and delete them from Static.h
Test: pass
Test: boots
Bug: 36075507
Change-Id: Ief7938812efe4a9fdf1d7c09850512f19023185d
diff --git a/transport/include/hidl/Static.h b/transport/include/hidl/Static.h
index 04b1729..e6c9139 100644
--- a/transport/include/hidl/Static.h
+++ b/transport/include/hidl/Static.h
@@ -17,31 +17,29 @@
// All static variables go here, to control initialization and
// destruction order in the library.
+#include <functional>
+
#include <android/hidl/base/1.0/IBase.h>
-#include <android/hidl/manager/1.0/IServiceManager.h>
#include <hidl/ConcurrentMap.h>
#include <hwbinder/IBinder.h>
#include <utils/StrongPointer.h>
-#include <utils/Mutex.h>
namespace android {
namespace hardware {
+namespace details {
-// For ServiceManagement.cpp
-extern Mutex gDefaultServiceManagerLock;
-extern sp<android::hidl::manager::V1_0::IServiceManager> gDefaultServiceManager;
-
-// For HidlBinderSupport
+// For HidlBinderSupport and autogenerated code
// value function receives reinterpret_cast<void *>(static_cast<IFoo *>(foo)),
// returns sp<IBinder>
extern ConcurrentMap<std::string,
std::function<sp<IBinder>(void *)>> gBnConstructorMap;
-// For HidlPassthroughSupport
+// For HidlPassthroughSupport and autogenerated code
// value function receives reinterpret_cast<void *>(static_cast<IFoo *>(foo)),
// returns sp<IBase>
extern ConcurrentMap<std::string,
std::function<sp<::android::hidl::base::V1_0::IBase>(void *)>> gBsConstructorMap;
-} // namespace hardware
-} // namespace android
+} // namespace details
+} // namespace hardware
+} // namespace android