Move hwbinder to the android::hidl namespace. This should prevent clashes if projects do want to link in both libbinder and libhwbinder. Also had to pull in Static.h from frameworks/native/include/private/binder, as that was not part of the history we pulled from frameworks/native. Change-Id: Ib7379e61229c3e68478f9c5530875292e1d51ded
diff --git a/Static.cpp b/Static.cpp index ef0251c..dda365e 100644 --- a/Static.cpp +++ b/Static.cpp
@@ -17,13 +17,14 @@ // All static variables go here, to control initialization and // destruction order in the library. -#include <private/binder/Static.h> +#include <hwbinder/Static.h> #include <hwbinder/BufferedTextOutput.h> #include <hwbinder/IPCThreadState.h> #include <utils/Log.h> namespace android { +namespace hidl { // ------------ Text output streams @@ -96,4 +97,5 @@ sp<IServiceManager> gDefaultServiceManager; sp<IPermissionController> gPermissionController; +} // namespace hidl } // namespace android