Update file path for D-Bus files

Bug: 24194427
TEST=Build for both Brillo and Chrome OS

Change-Id: Ic2b87900b1fd8f71a0f2c0ee5d642f14cd40a7ca

11 files changed, 27 insertions, 27 deletions

diff --git a/Android.mk b/Android.mk
index c8f4bf8..1d9eebd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,7 +67,9 @@ LOCAL_SRC_FILES := \
     dbus_bindings/org.chromium.apmanager.Service.dbus-xml \
     config.cc \
     daemon.cc \
-    dbus_control.cc \
+    dbus/dbus_control.cc \
+    dbus/firewalld_dbus_proxy.cc \
+    dbus/shill_dbus_proxy.cc \
     device.cc \
     device_info.cc \
     dhcp_server.cc \
@@ -75,13 +77,11 @@ LOCAL_SRC_FILES := \
     event_dispatcher.cc \
     file_writer.cc \
     firewall_manager.cc \
-    firewalld_dbus_proxy.cc \
     hostapd_monitor.cc \
     manager.cc \
     process_factory.cc \
     service.cc \
-    shill_manager.cc \
-    shill_dbus_proxy.cc
+    shill_manager.cc
 $(eval $(apmanager_common))
 include $(BUILD_STATIC_TEST_LIBRARY)
 
diff --git a/apmanager.gyp b/apmanager.gyp
index 100f410..f3c18a8 100644
--- a/apmanager.gyp
+++ b/apmanager.gyp
@@ -75,7 +75,9 @@
       'sources': [
         'config.cc',
         'daemon.cc',
-        'dbus_control.cc',
+        'dbus/dbus_control.cc',
+        'dbus/permission_broker_dbus_proxy.cc',
+        'dbus/shill_dbus_proxy.cc',
         'device.cc',
         'device_info.cc',
         'dhcp_server.cc',
@@ -85,10 +87,8 @@
         'firewall_manager.cc',
         'hostapd_monitor.cc',
         'manager.cc',
-        'permission_broker_dbus_proxy.cc',
         'process_factory.cc',
         'service.cc',
-        'shill_dbus_proxy.cc',
         'shill_manager.cc',
       ],
     },
diff --git a/daemon.cc b/daemon.cc
index e468dd9..696cea2 100644
--- a/daemon.cc
+++ b/daemon.cc
@@ -22,7 +22,7 @@
 #include <base/message_loop/message_loop_proxy.h>
 #include <base/run_loop.h>
 
-#include "apmanager/dbus_control.h"
+#include "apmanager/dbus/dbus_control.h"
 
 namespace apmanager {
 
diff --git a/dbus/dbus_control.cc b/dbus/dbus_control.cc
index 9cc227f..62e1d58 100644
--- a/dbus/dbus_control.cc
+++ b/dbus/dbus_control.cc
@@ -14,14 +14,14 @@
 // limitations under the License.
 //
 
-#include "apmanager/dbus_control.h"
+#include "apmanager/dbus/dbus_control.h"
 
-#include "apmanager/shill_dbus_proxy.h"
+#include "apmanager/dbus/shill_dbus_proxy.h"
 
 #if !defined(__ANDROID__)
-#include "apmanager/permission_broker_dbus_proxy.h"
+#include "apmanager/dbus/permission_broker_dbus_proxy.h"
 #else
-#include "apmanager/firewalld_dbus_proxy.h"
+#include "apmanager/dbus/firewalld_dbus_proxy.h"
 #endif  //__ANDROID__
 
 namespace apmanager {
diff --git a/dbus/dbus_control.h b/dbus/dbus_control.h
index 6d59e42..e1e775e 100644
--- a/dbus/dbus_control.h
+++ b/dbus/dbus_control.h
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef APMANAGER_DBUS_CONTROL_H_
-#define APMANAGER_DBUS_CONTROL_H_
+#ifndef APMANAGER_DBUS_DBUS_CONTROL_H_
+#define APMANAGER_DBUS_DBUS_CONTROL_H_
 
 #include <base/macros.h>
 #include <dbus/bus.h>
@@ -49,4 +49,4 @@ class DBusControl : public ControlInterface {
 
 }  // namespace apmanager
 
-#endif  // APMANAGER_DBUS_CONTROL_H_
+#endif  // APMANAGER_DBUS_DBUS_CONTROL_H_
diff --git a/dbus/firewalld_dbus_proxy.cc b/dbus/firewalld_dbus_proxy.cc
index 114e0b2..f9ab035 100644
--- a/dbus/firewalld_dbus_proxy.cc
+++ b/dbus/firewalld_dbus_proxy.cc
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include "apmanager/firewalld_dbus_proxy.h"
+#include "apmanager/dbus/firewalld_dbus_proxy.h"
 
 #include <base/bind.h>
 #include <brillo/errors/error.h>
diff --git a/dbus/firewalld_dbus_proxy.h b/dbus/firewalld_dbus_proxy.h
index 9cb305b..11aff3b 100644
--- a/dbus/firewalld_dbus_proxy.h
+++ b/dbus/firewalld_dbus_proxy.h
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef APMANAGER_FIREWALLD_DBUS_PROXY_H_
-#define APMANAGER_FIREWALLD_DBUS_PROXY_H_
+#ifndef APMANAGER_DBUS_FIREWALLD_DBUS_PROXY_H_
+#define APMANAGER_DBUS_FIREWALLD_DBUS_PROXY_H_
 
 #include <string>
 
@@ -62,4 +62,4 @@ class FirewalldDBusProxy : public FirewallProxyInterface {
 
 }  // namespace apmanager
 
-#endif  // APMANAGER_FIREWALLD_DBUS_PROXY_H_
+#endif  // APMANAGER_DBUS_FIREWALLD_DBUS_PROXY_H_
diff --git a/dbus/permission_broker_dbus_proxy.cc b/dbus/permission_broker_dbus_proxy.cc
index c39b440..7451d4c 100644
--- a/dbus/permission_broker_dbus_proxy.cc
+++ b/dbus/permission_broker_dbus_proxy.cc
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include "apmanager/permission_broker_dbus_proxy.h"
+#include "apmanager/dbus/permission_broker_dbus_proxy.h"
 
 #include <base/bind.h>
 #include <brillo/errors/error.h>
diff --git a/dbus/permission_broker_dbus_proxy.h b/dbus/permission_broker_dbus_proxy.h
index 6c4d050..8e0c5f9 100644
--- a/dbus/permission_broker_dbus_proxy.h
+++ b/dbus/permission_broker_dbus_proxy.h
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef APMANAGER_PERMISSION_BROKER_DBUS_PROXY_H_
-#define APMANAGER_PERMISSION_BROKER_DBUS_PROXY_H_
+#ifndef APMANAGER_DBUS_PERMISSION_BROKER_DBUS_PROXY_H_
+#define APMANAGER_DBUS_PERMISSION_BROKER_DBUS_PROXY_H_
 
 #include <string>
 
@@ -69,4 +69,4 @@ class PermissionBrokerDBusProxy : public FirewallProxyInterface {
 
 }  // namespace apmanager
 
-#endif  // APMANAGER_PERMISSION_BROKER_DBUS_PROXY_H_
+#endif  // APMANAGER_DBUS_PERMISSION_BROKER_DBUS_PROXY_H_
diff --git a/dbus/shill_dbus_proxy.cc b/dbus/shill_dbus_proxy.cc
index 75d243f..b37722a 100644
--- a/dbus/shill_dbus_proxy.cc
+++ b/dbus/shill_dbus_proxy.cc
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include "apmanager/shill_dbus_proxy.h"
+#include "apmanager/dbus/shill_dbus_proxy.h"
 
 #include <base/bind.h>
 #include <brillo/errors/error.h>
diff --git a/dbus/shill_dbus_proxy.h b/dbus/shill_dbus_proxy.h
index 8d5db25..59c3a15 100644
--- a/dbus/shill_dbus_proxy.h
+++ b/dbus/shill_dbus_proxy.h
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef APMANAGER_SHILL_DBUS_PROXY_H_
-#define APMANAGER_SHILL_DBUS_PROXY_H_
+#ifndef APMANAGER_DBUS_SHILL_DBUS_PROXY_H_
+#define APMANAGER_DBUS_SHILL_DBUS_PROXY_H_
 
 #include <string>
 
@@ -61,4 +61,4 @@ class ShillDBusProxy : public ShillProxyInterface {
 
 }  // namespace apmanager
 
-#endif  // APMANAGER_SHILL_DBUS_PROXY_H_
+#endif  // APMANAGER_DBUS_SHILL_DBUS_PROXY_H_