hal_adapter: Fix lint errors reported by `cros lint`
BUG=b:30824236
TEST=Pass presubmit checks.
Change-Id: I303087e95bf25655bcb5db5e9adc9c594df72226
Reviewed-on: https://chromium-review.googlesource.com/410465
Commit-Ready: Ricky Liang <jcliang@chromium.org>
Tested-by: Ricky Liang <jcliang@chromium.org>
Reviewed-by: Wu-cheng Li <wuchengli@chromium.org>
diff --git a/hal_adapter/Makefile b/hal_adapter/Makefile
index 5b7db43..3da0592 100644
--- a/hal_adapter/Makefile
+++ b/hal_adapter/Makefile
@@ -18,8 +18,9 @@
-I$(ANDROID_INCLUDE)/system/media/private/camera/include
CPPFLAGS += $(PC_CFLAGS)
-CXXFLAGS += -std=c++11 -Wall -Wpointer-arith $(ANDROID_INCLUDE_PATHS)
-CFLAGS += -Wall -std=gnu99 $(ANDROID_INCLUDE_PATHS)
+CXXFLAGS += -std=c++11 -Wall -Wpointer-arith -I$(abspath $(SRC)/../) \
+ $(ANDROID_INCLUDE_PATHS)
+CFLAGS += -Wall -std=gnu99 -I$(abspath $(SRC)/../) $(ANDROID_INCLUDE_PATHS)
LDLIBS += $(PC_LIBS) -ldl
diff --git a/hal_adapter/arc_camera3_main.cc b/hal_adapter/arc_camera3_main.cc
index 8bad142..ed65434 100644
--- a/hal_adapter/arc_camera3_main.cc
+++ b/hal_adapter/arc_camera3_main.cc
@@ -3,16 +3,16 @@
* found in the LICENSE file.
*/
-#include "arc_camera3_service_provider.h"
-#include "camera_hal_adapter.h"
-#include "hardware/hardware.h"
+#include <dlfcn.h>
#include <base/bind.h>
#include <base/command_line.h>
#include <brillo/daemons/daemon.h>
#include <brillo/syslog_logging.h>
-#include <dlfcn.h>
+#include "hal_adapter/arc_camera3_service_provider.h"
+#include "hal_adapter/camera_hal_adapter.h"
+#include "hardware/hardware.h"
const char kCameraHalDllName[] = "libarccamera.so";
diff --git a/hal_adapter/arc_camera3_mojo_utils.cc b/hal_adapter/arc_camera3_mojo_utils.cc
index 42adb10..a104642 100644
--- a/hal_adapter/arc_camera3_mojo_utils.cc
+++ b/hal_adapter/arc_camera3_mojo_utils.cc
@@ -4,7 +4,9 @@
* found in the LICENSE file.
*/
-#include "arc_camera3_mojo_utils.h"
+#include "hal_adapter/arc_camera3_mojo_utils.h"
+
+#include <utility>
#include <mojo/edk/embedder/embedder.h>
#include <mojo/edk/embedder/scoped_platform_handle.h>
@@ -36,8 +38,8 @@
return scoped_platform_handle.release().handle;
}
-mojom::HandlePtr SerializeHandle(int handle) {
- mojom::HandlePtr ret = mojom::Handle::New();
+arc::mojom::HandlePtr SerializeHandle(int handle) {
+ arc::mojom::HandlePtr ret = arc::mojom::Handle::New();
if (handle == -1) {
ret->set_none(true);
} else if (handle >= 0) {
@@ -51,21 +53,22 @@
}
// Transfers ownership of the handle.
-int DeserializeHandle(mojom::HandlePtr& handle) {
+int DeserializeHandle(const arc::mojom::HandlePtr& handle) {
if (handle->is_none()) {
return -1;
}
return UnwrapPlatformHandle(std::move(handle->get_h()));
}
-mojom::NativeHandlePtr SerializeNativeHandle(const native_handle_t* handle) {
- mojom::NativeHandlePtr ret = mojom::NativeHandle::New();
+arc::mojom::NativeHandlePtr SerializeNativeHandle(
+ const native_handle_t* handle) {
+ arc::mojom::NativeHandlePtr ret = arc::mojom::NativeHandle::New();
ret->version = handle->version;
ret->num_fds = handle->numFds;
ret->num_ints = handle->numInts;
for (int i = 0; i < handle->numFds; i++) {
- mojom::HandlePtr wrapped_handle = SerializeHandle(handle->data[i]);
+ arc::mojom::HandlePtr wrapped_handle = SerializeHandle(handle->data[i]);
if (wrapped_handle->is_h() && !wrapped_handle->get_h().is_valid()) {
LOG(ERROR) << "Failed to wrap buffer handle";
ret.reset();
@@ -82,7 +85,7 @@
}
// The caller must allocate the memory for out_handle.
-int DeserializeNativeHandle(mojom::NativeHandlePtr& ptr,
+int DeserializeNativeHandle(const arc::mojom::NativeHandlePtr& ptr,
native_handle_t* out_handle) {
out_handle->version = ptr->version;
out_handle->numFds = ptr->num_fds;
@@ -104,10 +107,11 @@
return 0;
}
-mojom::Camera3StreamBufferPtr SerializeStreamBuffer(
+arc::mojom::Camera3StreamBufferPtr SerializeStreamBuffer(
const camera3_stream_buffer_t* buffer,
- UniqueStreams& streams) {
- mojom::Camera3StreamBufferPtr ret = mojom::Camera3StreamBuffer::New();
+ const UniqueStreams& streams) {
+ arc::mojom::Camera3StreamBufferPtr ret =
+ arc::mojom::Camera3StreamBuffer::New();
if (!buffer) {
ret.reset();
@@ -152,8 +156,8 @@
return ret;
}
-int DeserializeStreamBuffer(mojom::Camera3StreamBufferPtr& ptr,
- UniqueStreams& streams,
+int DeserializeStreamBuffer(const arc::mojom::Camera3StreamBufferPtr& ptr,
+ const UniqueStreams& streams,
camera3_stream_buffer_t* out_buffer) {
auto it = streams.find(ptr->stream_id);
if (it == streams.end()) {
diff --git a/hal_adapter/arc_camera3_mojo_utils.h b/hal_adapter/arc_camera3_mojo_utils.h
index 047a639..bd00e4b 100644
--- a/hal_adapter/arc_camera3_mojo_utils.h
+++ b/hal_adapter/arc_camera3_mojo_utils.h
@@ -4,16 +4,14 @@
* found in the LICENSE file.
*/
-#ifndef ARC_CAMERA3_MOJO_UTILS_H_
-#define ARC_CAMERA3_MOJO_UTILS_H_
+#ifndef HAL_ADAPTER_ARC_CAMERA3_MOJO_UTILS_H_
+#define HAL_ADAPTER_ARC_CAMERA3_MOJO_UTILS_H_
-#include "arc_camera3.mojom.h"
-#include "hardware/camera3.h"
-
-#include <chrono>
-#include <future>
+#include <chrono> // NOLINT(build/c++11)
+#include <future> // NOLINT(build/c++11)
#include <map>
#include <memory>
+#include <utility>
#include <base/bind.h>
#include <base/bind_helpers.h>
@@ -21,9 +19,10 @@
#include <mojo/public/cpp/bindings/binding.h>
#include <mojo/public/cpp/system/data_pipe.h>
-namespace internal {
+#include "hal_adapter/arc_camera3.mojom.h"
+#include "hardware/camera3.h"
-using namespace arc;
+namespace internal {
// Common data types.
@@ -53,21 +52,22 @@
int UnwrapPlatformHandle(mojo::ScopedHandle handle);
-mojom::HandlePtr SerializeHandle(int handle);
+arc::mojom::HandlePtr SerializeHandle(int handle);
-int DeserializeHandle(mojom::HandlePtr& handle);
+int DeserializeHandle(const arc::mojom::HandlePtr& handle);
-mojom::NativeHandlePtr SerializeNativeHandle(const native_handle_t* handle);
+arc::mojom::NativeHandlePtr SerializeNativeHandle(
+ const native_handle_t* handle);
-int DeserializeNativeHandle(mojom::NativeHandlePtr& ptr,
+int DeserializeNativeHandle(const arc::mojom::NativeHandlePtr& ptr,
native_handle_t* handle);
-mojom::Camera3StreamBufferPtr SerializeStreamBuffer(
+arc::mojom::Camera3StreamBufferPtr SerializeStreamBuffer(
const camera3_stream_buffer_t* buffer,
- UniqueStreams& streams);
+ const UniqueStreams& streams);
-int DeserializeStreamBuffer(mojom::Camera3StreamBufferPtr& ptr,
- UniqueStreams& streams,
+int DeserializeStreamBuffer(const arc::mojom::Camera3StreamBufferPtr& ptr,
+ const UniqueStreams& streams,
camera3_stream_buffer_t* buffer);
int32_t SerializeCameraMetadata(
@@ -139,12 +139,12 @@
template <typename T>
void FutureCallback(Future<T>* future, T ret) {
future->Set(std::move(ret));
-};
+}
template <typename T>
base::Callback<void(T)> GetFutureCallback(Future<T>* future) {
return base::Bind(&FutureCallback<T>, base::Unretained(future));
-};
+}
base::Callback<void()> GetFutureCallback(Future<void>* future);
@@ -153,7 +153,7 @@
template <typename T>
class MojoInterfaceDelegate {
public:
- MojoInterfaceDelegate(mojo::InterfacePtrInfo<T> interface_ptr_info)
+ explicit MojoInterfaceDelegate(mojo::InterfacePtrInfo<T> interface_ptr_info)
: thread_("Delegate thread") {
if (!thread_.StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_IO, 0))) {
@@ -224,7 +224,7 @@
template <typename T>
class MojoBindingDelegate : public T {
public:
- MojoBindingDelegate(base::Closure quit_cb = base::Closure())
+ explicit MojoBindingDelegate(base::Closure quit_cb = base::Closure())
: thread_("Delegate thread"), binding_(this) {
if (!thread_.StartWithOptions(
base::Thread::Options(base::MessageLoop::TYPE_IO, 0))) {
@@ -315,4 +315,4 @@
} // namespace internal
-#endif // ARC_CAMERA3_MOJO_UTILS_H_
+#endif // HAL_ADAPTER_ARC_CAMERA3_MOJO_UTILS_H_
diff --git a/hal_adapter/arc_camera3_service_provider.cc b/hal_adapter/arc_camera3_service_provider.cc
index 28ee66e..68d2755 100644
--- a/hal_adapter/arc_camera3_service_provider.cc
+++ b/hal_adapter/arc_camera3_service_provider.cc
@@ -4,8 +4,7 @@
* found in the LICENSE file.
*/
-#include "arc_camera3_service_provider.h"
-#include "ipc_util.h"
+#include "hal_adapter/arc_camera3_service_provider.h"
#include <fcntl.h>
#include <sys/socket.h>
@@ -17,6 +16,8 @@
#include <base/files/scoped_file.h>
#include <base/logging.h>
+#include "hal_adapter/ipc_util.h"
+
namespace arc {
const char kArcCameraSocketPath[] = "/var/run/camera/camera3.sock";
diff --git a/hal_adapter/arc_camera3_service_provider.h b/hal_adapter/arc_camera3_service_provider.h
index b7e7194..518573d 100644
--- a/hal_adapter/arc_camera3_service_provider.h
+++ b/hal_adapter/arc_camera3_service_provider.h
@@ -4,8 +4,8 @@
* found in the LICENSE file.
*/
-#ifndef ARC_CAMERA3_SERVICE_PROVIDER_H_
-#define ARC_CAMERA3_SERVICE_PROVIDER_H_
+#ifndef HAL_ADAPTER_ARC_CAMERA3_SERVICE_PROVIDER_H_
+#define HAL_ADAPTER_ARC_CAMERA3_SERVICE_PROVIDER_H_
#include <base/files/scoped_file.h>
@@ -26,9 +26,10 @@
// creating socket file failed. Otherwise, return fd for accepted connection.
int Start();
+ private:
DISALLOW_COPY_AND_ASSIGN(ArcCamera3ServiceProvider);
};
} // namespace arc
-#endif // ARC_CAMERA3_SERVICE_PROVIDER_H_
+#endif // HAL_ADAPTER_ARC_CAMERA3_SERVICE_PROVIDER_H_
diff --git a/hal_adapter/camera3_callback_ops_delegate.cc b/hal_adapter/camera3_callback_ops_delegate.cc
index 91baf84..662bcf1 100644
--- a/hal_adapter/camera3_callback_ops_delegate.cc
+++ b/hal_adapter/camera3_callback_ops_delegate.cc
@@ -4,12 +4,15 @@
* found in the LICENSE file.
*/
-#include "camera3_callback_ops_delegate.h"
-#include "camera_device_adapter.h"
+#include "hal_adapter/camera3_callback_ops_delegate.h"
+
+#include <utility>
#include <base/bind.h>
#include <base/bind_helpers.h>
+#include "hal_adapter/camera_device_adapter.h"
+
namespace arc {
Camera3CallbackOpsDelegate::Camera3CallbackOpsDelegate(
diff --git a/hal_adapter/camera3_callback_ops_delegate.h b/hal_adapter/camera3_callback_ops_delegate.h
index 9adb9bc..300c5f4 100644
--- a/hal_adapter/camera3_callback_ops_delegate.h
+++ b/hal_adapter/camera3_callback_ops_delegate.h
@@ -4,11 +4,11 @@
* found in the LICENSE file.
*/
-#ifndef CAMERA3_CALLBACK_OPS_DELEGATE_H_
-#define CAMERA3_CALLBACK_OPS_DELEGATE_H_
+#ifndef HAL_ADAPTER_CAMERA3_CALLBACK_OPS_DELEGATE_H_
+#define HAL_ADAPTER_CAMERA3_CALLBACK_OPS_DELEGATE_H_
-#include "arc_camera3.mojom.h"
-#include "arc_camera3_mojo_utils.h"
+#include "hal_adapter/arc_camera3.mojom.h"
+#include "hal_adapter/arc_camera3_mojo_utils.h"
#include "hardware/camera3.h"
namespace arc {
@@ -46,4 +46,4 @@
} // end of namespace arc
-#endif // CAMERA3_CALLBACK_OPS_DELEGATE_H_
+#endif // HAL_ADAPTER_CAMERA3_CALLBACK_OPS_DELEGATE_H_
diff --git a/hal_adapter/camera3_device_ops_delegate.cc b/hal_adapter/camera3_device_ops_delegate.cc
index 2b40a60..f7ed469 100644
--- a/hal_adapter/camera3_device_ops_delegate.cc
+++ b/hal_adapter/camera3_device_ops_delegate.cc
@@ -4,8 +4,11 @@
* found in the LICENSE file.
*/
-#include "camera3_device_ops_delegate.h"
-#include "camera_device_adapter.h"
+#include "hal_adapter/camera3_device_ops_delegate.h"
+
+#include <utility>
+
+#include "hal_adapter/camera_device_adapter.h"
namespace arc {
diff --git a/hal_adapter/camera3_device_ops_delegate.h b/hal_adapter/camera3_device_ops_delegate.h
index 00f4c6f..fce9d14 100644
--- a/hal_adapter/camera3_device_ops_delegate.h
+++ b/hal_adapter/camera3_device_ops_delegate.h
@@ -4,11 +4,11 @@
* found in the LICENSE file.
*/
-#ifndef CAMERA3_DEVICE_OPS_DELEGATE_H_
-#define CAMERA3_DEVICE_OPS_DELEGATE_H_
+#ifndef HAL_ADAPTER_CAMERA3_DEVICE_OPS_DELEGATE_H_
+#define HAL_ADAPTER_CAMERA3_DEVICE_OPS_DELEGATE_H_
-#include "arc_camera3.mojom.h"
-#include "arc_camera3_mojo_utils.h"
+#include "hal_adapter/arc_camera3.mojom.h"
+#include "hal_adapter/arc_camera3_mojo_utils.h"
namespace arc {
@@ -17,7 +17,7 @@
class Camera3DeviceOpsDelegate
: public internal::MojoBindingDelegate<mojom::Camera3DeviceOps> {
public:
- Camera3DeviceOpsDelegate(CameraDeviceAdapter* camera_device_adapter);
+ explicit Camera3DeviceOpsDelegate(CameraDeviceAdapter* camera_device_adapter);
~Camera3DeviceOpsDelegate();
@@ -47,4 +47,4 @@
} // namespace arc
-#endif // CAMERA3_DEVICE_OPS_DELEGATE_H_
+#endif // HAL_ADAPTER_CAMERA3_DEVICE_OPS_DELEGATE_H_
diff --git a/hal_adapter/camera_device_adapter.cc b/hal_adapter/camera_device_adapter.cc
index c04fd6e..73fd3c2 100644
--- a/hal_adapter/camera_device_adapter.cc
+++ b/hal_adapter/camera_device_adapter.cc
@@ -4,17 +4,19 @@
* found in the LICENSE file.
*/
-#include "camera3_callback_ops_delegate.h"
-#include "camera3_device_ops_delegate.h"
-#include "camera_device_adapter.h"
+#include "hal_adapter/camera_device_adapter.h"
#include <set>
+#include <utility>
#include <vector>
#include <base/bind.h>
#include <base/bind_helpers.h>
#include <base/logging.h>
+#include "hal_adapter/camera3_callback_ops_delegate.h"
+#include "hal_adapter/camera3_device_ops_delegate.h"
+
namespace arc {
CameraDeviceAdapter::CameraDeviceAdapter(camera3_device_t* camera_device)
diff --git a/hal_adapter/camera_device_adapter.h b/hal_adapter/camera_device_adapter.h
index 79a2a25..1872eac 100644
--- a/hal_adapter/camera_device_adapter.h
+++ b/hal_adapter/camera_device_adapter.h
@@ -4,12 +4,8 @@
* found in the LICENSE file.
*/
-#ifndef CAMERA_DEVICE_ADAPTER_H_
-#define CAMERA_DEVICE_ADAPTER_H_
-
-#include "arc_camera3.mojom.h"
-#include "arc_camera3_mojo_utils.h"
-#include "hardware/camera3.h"
+#ifndef HAL_ADAPTER_CAMERA_DEVICE_ADAPTER_H_
+#define HAL_ADAPTER_CAMERA_DEVICE_ADAPTER_H_
#include <map>
#include <memory>
@@ -17,6 +13,10 @@
#include <base/threading/thread.h>
#include <mojo/public/cpp/bindings/binding.h>
+#include "hal_adapter/arc_camera3.mojom.h"
+#include "hal_adapter/arc_camera3_mojo_utils.h"
+#include "hardware/camera3.h"
+
namespace arc {
class Camera3DeviceOpsDelegate;
@@ -25,7 +25,7 @@
class CameraDeviceAdapter {
public:
- CameraDeviceAdapter(camera3_device_t* camera_device);
+ explicit CameraDeviceAdapter(camera3_device_t* camera_device);
~CameraDeviceAdapter();
@@ -71,4 +71,4 @@
} // namespace arc
-#endif // CAMERA_DEVICE_ADAPTER_H_
+#endif // HAL_ADAPTER_CAMERA_DEVICE_ADAPTER_H_
diff --git a/hal_adapter/camera_hal_adapter.cc b/hal_adapter/camera_hal_adapter.cc
index 40f648c..df570c4 100644
--- a/hal_adapter/camera_hal_adapter.cc
+++ b/hal_adapter/camera_hal_adapter.cc
@@ -4,14 +4,12 @@
* found in the LICENSE file.
*/
-#include "arc_camera3_mojo_utils.h"
-#include "camera_device_adapter.h"
-#include "camera_hal_adapter.h"
-#include "camera_module_callbacks_delegate.h"
-#include "camera_module_delegate.h"
+#include "hal_adapter/camera_hal_adapter.h"
+
+#include <fcntl.h>
#include <deque>
-#include <fcntl.h>
+#include <utility>
#include <base/bind.h>
#include <base/bind_helpers.h>
@@ -22,6 +20,11 @@
#include <mojo/edk/embedder/platform_handle_vector.h>
#include <mojo/edk/embedder/scoped_platform_handle.h>
+#include "hal_adapter/arc_camera3_mojo_utils.h"
+#include "hal_adapter/camera_device_adapter.h"
+#include "hal_adapter/camera_module_callbacks_delegate.h"
+#include "hal_adapter/camera_module_delegate.h"
+
namespace arc {
CameraHalAdapter::CameraHalAdapter(camera_module_t* camera_module,
diff --git a/hal_adapter/camera_hal_adapter.h b/hal_adapter/camera_hal_adapter.h
index fbbe017..9c1b4af 100644
--- a/hal_adapter/camera_hal_adapter.h
+++ b/hal_adapter/camera_hal_adapter.h
@@ -4,11 +4,8 @@
* found in the LICENSE file.
*/
-#ifndef CAMERA_HAL_ADAPTER_H_
-#define CAMERA_HAL_ADAPTER_H_
-
-#include "arc_camera3.mojom.h"
-#include "hardware/camera3.h"
+#ifndef HAL_ADAPTER_CAMERA_HAL_ADAPTER_H_
+#define HAL_ADAPTER_CAMERA_HAL_ADAPTER_H_
#include <map>
#include <memory>
@@ -17,6 +14,9 @@
#include <base/threading/thread.h>
#include <mojo/edk/embedder/process_delegate.h>
+#include "hal_adapter/arc_camera3.mojom.h"
+#include "hardware/camera3.h"
+
namespace arc {
class CameraDeviceAdapter;
@@ -69,4 +69,4 @@
} // namespace arc
-#endif // CAMERA_HAL_ADAPTER_H_
+#endif // HAL_ADAPTER_CAMERA_HAL_ADAPTER_H_
diff --git a/hal_adapter/camera_module_callbacks_delegate.cc b/hal_adapter/camera_module_callbacks_delegate.cc
index 8cc1a2d..e50e1ea 100644
--- a/hal_adapter/camera_module_callbacks_delegate.cc
+++ b/hal_adapter/camera_module_callbacks_delegate.cc
@@ -4,7 +4,9 @@
* found in the LICENSE file.
*/
-#include "camera_module_callbacks_delegate.h"
+#include "hal_adapter/camera_module_callbacks_delegate.h"
+
+#include <utility>
#include <base/bind.h>
#include <base/bind_helpers.h>
diff --git a/hal_adapter/camera_module_callbacks_delegate.h b/hal_adapter/camera_module_callbacks_delegate.h
index 3d6adad..4c46d7c 100644
--- a/hal_adapter/camera_module_callbacks_delegate.h
+++ b/hal_adapter/camera_module_callbacks_delegate.h
@@ -4,11 +4,11 @@
* found in the LICENSE file.
*/
-#ifndef CAMERA_MODULE_CALLBACKS_DELEGATE_H_
-#define CAMERA_MODULE_CALLBACKS_DELEGATE_H_
+#ifndef HAL_ADAPTER_CAMERA_MODULE_CALLBACKS_DELEGATE_H_
+#define HAL_ADAPTER_CAMERA_MODULE_CALLBACKS_DELEGATE_H_
-#include "arc_camera3.mojom.h"
-#include "arc_camera3_mojo_utils.h"
+#include "hal_adapter/arc_camera3.mojom.h"
+#include "hal_adapter/arc_camera3_mojo_utils.h"
namespace arc {
@@ -37,4 +37,4 @@
} // namespace arc
-#endif // CAMERA_MODULE_CALLBACKS_DELEGATE_H_
+#endif // HAL_ADAPTER_CAMERA_MODULE_CALLBACKS_DELEGATE_H_
diff --git a/hal_adapter/camera_module_delegate.cc b/hal_adapter/camera_module_delegate.cc
index 65320ce..cc08492 100644
--- a/hal_adapter/camera_module_delegate.cc
+++ b/hal_adapter/camera_module_delegate.cc
@@ -4,8 +4,11 @@
* found in the LICENSE file.
*/
-#include "camera_hal_adapter.h"
-#include "camera_module_delegate.h"
+#include "hal_adapter/camera_module_delegate.h"
+
+#include <utility>
+
+#include "hal_adapter/camera_hal_adapter.h"
namespace arc {
diff --git a/hal_adapter/camera_module_delegate.h b/hal_adapter/camera_module_delegate.h
index a220277..9556ac7 100644
--- a/hal_adapter/camera_module_delegate.h
+++ b/hal_adapter/camera_module_delegate.h
@@ -4,11 +4,11 @@
* found in the LICENSE file.
*/
-#ifndef CAMERA_MODULE_DELEGATE_H_
-#define CAMERA_MODULE_DELEGATE_H_
+#ifndef HAL_ADAPTER_CAMERA_MODULE_DELEGATE_H_
+#define HAL_ADAPTER_CAMERA_MODULE_DELEGATE_H_
-#include "arc_camera3_mojo_utils.h"
-#include "arc_camera3.mojom.h"
+#include "hal_adapter/arc_camera3.mojom.h"
+#include "hal_adapter/arc_camera3_mojo_utils.h"
namespace arc {
@@ -44,4 +44,4 @@
} // namespace arc
-#endif // CAMERA_MODULE_DELEGATE_H_
+#endif // HAL_ADAPTER_CAMERA_MODULE_DELEGATE_H_
diff --git a/hal_adapter/ipc_util.cc b/hal_adapter/ipc_util.cc
index f5b1f92..18c5ec0 100644
--- a/hal_adapter/ipc_util.cc
+++ b/hal_adapter/ipc_util.cc
@@ -4,7 +4,7 @@
* found in the LICENSE file.
*/
-#include "ipc_util.h"
+#include "hal_adapter/ipc_util.h"
#include <errno.h>
#include <fcntl.h>
@@ -127,4 +127,4 @@
return true;
}
-} // namespace
+} // namespace internal
diff --git a/hal_adapter/ipc_util.h b/hal_adapter/ipc_util.h
index 9461867..ad32c20 100644
--- a/hal_adapter/ipc_util.h
+++ b/hal_adapter/ipc_util.h
@@ -4,8 +4,10 @@
* found in the LICENSE file.
*/
-#ifndef IPC_UTIL_H_
-#define IPC_UTIL_H_
+#ifndef HAL_ADAPTER_IPC_UTIL_H_
+#define HAL_ADAPTER_IPC_UTIL_H_
+
+#include <string>
namespace base {
class FilePath;
@@ -17,6 +19,6 @@
int* server_listen_fd);
bool ServerAcceptConnection(int server_listen_fd, int* server_socket);
-} // namespace
+} // namespace internal
-#endif // IPC_UTIL_H_
+#endif // HAL_ADAPTER_IPC_UTIL_H_
