mtpd: prepend mtpd/ to all local includes
Since we're pulling in headers from the gen directory and also
from other packages (system_api), it makes sense to be explicit
about the fact that the other headers are also coming from the
mtpd directory instead of relying on the fact that they are in
the current directory during compilation.
This also allows us to alphabetize the includes better.
BUG=chromium:757584
TEST=emerge-cyan mtpd; FEATURES=test emerge-cyan mtpd
Change-Id: I3837f40961ca1bf6f6e1c6531a5f12188e62cf10
Reviewed-on: https://chromium-review.googlesource.com/625054
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
diff --git a/daemon.cc b/daemon.cc
index e75553e..5796311 100644
--- a/daemon.cc
+++ b/daemon.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "daemon.h"
+#include "mtpd/daemon.h"
namespace mtpd {
diff --git a/daemon.h b/daemon.h
index 31298a2..7ac997f 100644
--- a/daemon.h
+++ b/daemon.h
@@ -7,7 +7,7 @@
#include <base/macros.h>
-#include "mtpd_server_impl.h"
+#include "mtpd/mtpd_server_impl.h"
namespace mtpd {
diff --git a/device_manager.cc b/device_manager.cc
index 041a4b6..5af7f5a 100644
--- a/device_manager.cc
+++ b/device_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "device_manager.h"
+#include "mtpd/device_manager.h"
#include <libudev.h>
#include <sys/stat.h>
@@ -21,7 +21,7 @@
#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
-#include "device_event_delegate.h"
+#include "mtpd/device_event_delegate.h"
namespace mtpd {
diff --git a/device_manager.h b/device_manager.h
index 368d55b..807eafc 100644
--- a/device_manager.h
+++ b/device_manager.h
@@ -19,8 +19,8 @@
#include <base/synchronization/lock.h>
#include <base/threading/simple_thread.h>
-#include "file_entry.h"
-#include "storage_info.h"
+#include "mtpd/file_entry.h"
+#include "mtpd/storage_info.h"
extern "C" {
struct udev;
diff --git a/device_manager_unittest.cc b/device_manager_unittest.cc
index 37f2396..aef2636 100644
--- a/device_manager_unittest.cc
+++ b/device_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "device_manager.h"
+#include "mtpd/device_manager.h"
#include <string>
#include <vector>
@@ -11,7 +11,7 @@
#include <base/compiler_specific.h>
-#include "device_event_delegate.h"
+#include "mtpd/device_event_delegate.h"
namespace mtpd {
namespace {
diff --git a/file_entry.cc b/file_entry.cc
index 7660b4b..fd6c8fd 100644
--- a/file_entry.cc
+++ b/file_entry.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "file_entry.h"
+#include "mtpd/file_entry.h"
#include <base/logging.h>
#include <chromeos/dbus/service_constants.h>
-#include "string_helpers.h"
+#include "mtpd/string_helpers.h"
namespace {
diff --git a/main.cc b/main.cc
index f851e43..a1e25b0 100644
--- a/main.cc
+++ b/main.cc
@@ -17,7 +17,7 @@
#include <chromeos/dbus/service_constants.h>
#include <dbus-c++/glib-integration.h>
-#include "daemon.h"
+#include "mtpd/daemon.h"
using base::CommandLine;
diff --git a/mtpd_server_impl.cc b/mtpd_server_impl.cc
index adae844..738d73c 100644
--- a/mtpd_server_impl.cc
+++ b/mtpd_server_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mtpd_server_impl.h"
+#include "mtpd/mtpd_server_impl.h"
#include <base/logging.h>
#include <base/rand_util.h>
diff --git a/mtpd_server_impl.h b/mtpd_server_impl.h
index af56a42..67a8a04 100644
--- a/mtpd_server_impl.h
+++ b/mtpd_server_impl.h
@@ -11,10 +11,10 @@
#include <base/compiler_specific.h>
#include <base/macros.h>
-#include "device_event_delegate.h"
-#include "device_manager.h"
-#include "file_entry.h"
#include "mtpd/dbus_adaptors/org.chromium.Mtpd.h"
+#include "mtpd/device_event_delegate.h"
+#include "mtpd/device_manager.h"
+#include "mtpd/file_entry.h"
namespace mtpd {
diff --git a/storage_info.cc b/storage_info.cc
index 29a1239..02f1cd1 100644
--- a/storage_info.cc
+++ b/storage_info.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "storage_info.h"
+#include "mtpd/storage_info.h"
#include <base/logging.h>
#include <chromeos/dbus/service_constants.h>
-#include "string_helpers.h"
+#include "mtpd/string_helpers.h"
#include "system_api/proto_bindings/mtp_storage_info.pb.h"
namespace mtpd {
diff --git a/string_helpers.cc b/string_helpers.cc
index aae1d62..18de4a8 100644
--- a/string_helpers.cc
+++ b/string_helpers.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "string_helpers.h"
+#include "mtpd/string_helpers.h"
#include <base/strings/string_util.h>
