From e01f4f2b38beb5799dece8742eef5d70d131dbd3 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Thu, 12 May 2016 12:33:28 +0200 Subject: 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 --- Binder.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Binder.cpp') diff --git a/Binder.cpp b/Binder.cpp index 7581d65..d2af3ce 100644 --- a/Binder.cpp +++ b/Binder.cpp @@ -26,6 +26,7 @@ #include namespace android { +namespace hidl { // --------------------------------------------------------------------------- @@ -301,4 +302,5 @@ bool BpRefBase::onIncStrongAttempted(uint32_t /*flags*/, const void* /*id*/) // --------------------------------------------------------------------------- +}; // namespace hidl }; // namespace android -- cgit v1.2.3