Unify DBus adaptor include paths.

Now the DBus header generation in AOSP has stabilized, we should resolve
these differences.

Bug: 23426296
Change-Id: I7de2d63efdc3a5f5d2479a3a9d6f08fc8ce9b7bb

3 files changed, 4 insertions, 10 deletions

diff --git a/firewall_service.h b/firewall_service.h
index 3786e4e..efb3d6b 100644
--- a/firewall_service.h
+++ b/firewall_service.h
@@ -21,11 +21,9 @@
 #include <base/memory/weak_ptr.h>
 #include <chromeos/dbus/dbus_object.h>
 
-#if defined(__ANDROID__)
-# include "dbus_bindings/org.chromium.Firewalld.h"
-#else
+#include "dbus_bindings/org.chromium.Firewalld.h"
+#if !defined(__ANDROID__)
 # include "permission_broker/dbus-proxies.h"
-# include "firewalld/dbus_adaptor/org.chromium.Firewalld.h"
 #endif  // __ANDROID__
 
 #include "iptables.h"
diff --git a/firewalld.gyp b/firewalld.gyp
index 0f551d5..cc0a60a 100644
--- a/firewalld.gyp
+++ b/firewalld.gyp
@@ -23,7 +23,7 @@
       'type': 'none',
       'variables': {
         'dbus_service_config': 'dbus_bindings/dbus-service-config.json',
-        'dbus_adaptors_out_dir': 'include/firewalld/dbus_adaptor',
+        'dbus_adaptors_out_dir': 'include/dbus_bindings',
       },
       'sources': [
         'dbus_bindings/org.chromium.Firewalld.xml',
diff --git a/iptables.h b/iptables.h
index ebd556d..f5dc5a5 100644
--- a/iptables.h
+++ b/iptables.h
@@ -25,11 +25,7 @@
 #include <base/macros.h>
 #include <chromeos/errors/error.h>
 
-#if defined(__ANDROID__)
-# include "dbus_bindings/org.chromium.Firewalld.h"
-#else
-# include "firewalld/dbus_adaptor/org.chromium.Firewalld.h"
-#endif  // __ANDROID__
+#include "dbus_bindings/org.chromium.Firewalld.h"
 
 namespace firewalld {