Rename DBus definition files

Android build system expects DBus definition file name to end
with .dbus-xml extension. So rename DBus definition files
to make it consistent for both platforms.

Also update the output directory for adaptor headers, so that
it will be the same on both platforms.

Bug: 24164800
TEST=emerge-$BOARD --unmerge apmanager
TEST=sudo rm -rf /build/$BOARD/var/cache/portage/chromeos-base/apmanager
TEST=emerge-$BOARD apmanager

Change-Id: I808983591d0633fe37b83e54237575419476e2b5

9 files changed, 14 insertions, 14 deletions

diff --git a/apmanager.gyp b/apmanager.gyp
index 0d3433a..b90edc4 100644
--- a/apmanager.gyp
+++ b/apmanager.gyp
@@ -40,13 +40,14 @@
       'target_name': 'apmanager-adaptors',
       'type': 'none',
       'variables': {
-        'dbus_adaptors_out_dir': 'include/apmanager/dbus_adaptors',
+        'dbus_adaptors_out_dir': 'include/dbus_bindings',
+        'dbus_xml_extension': 'dbus-xml',
       },
       'sources': [
-        'dbus_bindings/org.chromium.apmanager.Config.xml',
-        'dbus_bindings/org.chromium.apmanager.Device.xml',
-        'dbus_bindings/org.chromium.apmanager.Manager.xml',
-        'dbus_bindings/org.chromium.apmanager.Service.xml',
+        'dbus_bindings/org.chromium.apmanager.Config.dbus-xml',
+        'dbus_bindings/org.chromium.apmanager.Device.dbus-xml',
+        'dbus_bindings/org.chromium.apmanager.Manager.dbus-xml',
+        'dbus_bindings/org.chromium.apmanager.Service.dbus-xml',
       ],
       'includes': ['../../../../platform2/common-mk/generate-dbus-adaptors.gypi'],
     },
@@ -117,10 +118,10 @@
             'proxy_path_in_mocks': 'apmanager/dbus-proxies.h',
           },
           'sources': [
-            'dbus_bindings/org.chromium.apmanager.Config.xml',
-            'dbus_bindings/org.chromium.apmanager.Device.xml',
-            'dbus_bindings/org.chromium.apmanager.Manager.xml',
-            'dbus_bindings/org.chromium.apmanager.Service.xml',
+            'dbus_bindings/org.chromium.apmanager.Config.dbus-xml',
+            'dbus_bindings/org.chromium.apmanager.Device.dbus-xml',
+            'dbus_bindings/org.chromium.apmanager.Manager.dbus-xml',
+            'dbus_bindings/org.chromium.apmanager.Service.dbus-xml',
           ],
           'includes': ['../../../../platform2/common-mk/generate-dbus-proxies.gypi'],
         },
diff --git a/config.h b/config.h
index e4075e0..777927b 100644
--- a/config.h
+++ b/config.h
@@ -23,7 +23,7 @@
 #include <base/macros.h>
 #include <chromeos/errors/error.h>
 
-#include "apmanager/dbus_adaptors/org.chromium.apmanager.Config.h"
+#include "dbus_bindings/org.chromium.apmanager.Config.h"
 
 namespace apmanager {
 
diff --git a/dbus_bindings/org.chromium.apmanager.Config.xml b/dbus_bindings/org.chromium.apmanager.Config.dbus-xml
index 815a617..815a617 100644
--- a/dbus_bindings/org.chromium.apmanager.Config.xml
+++ b/dbus_bindings/org.chromium.apmanager.Config.dbus-xml
diff --git a/dbus_bindings/org.chromium.apmanager.Device.xml b/dbus_bindings/org.chromium.apmanager.Device.dbus-xml
index e429ce7..e429ce7 100644
--- a/dbus_bindings/org.chromium.apmanager.Device.xml
+++ b/dbus_bindings/org.chromium.apmanager.Device.dbus-xml
diff --git a/dbus_bindings/org.chromium.apmanager.Manager.xml b/dbus_bindings/org.chromium.apmanager.Manager.dbus-xml
index 591204f..591204f 100644
--- a/dbus_bindings/org.chromium.apmanager.Manager.xml
+++ b/dbus_bindings/org.chromium.apmanager.Manager.dbus-xml
diff --git a/dbus_bindings/org.chromium.apmanager.Service.xml b/dbus_bindings/org.chromium.apmanager.Service.dbus-xml
index c17a2f9..c17a2f9 100644
--- a/dbus_bindings/org.chromium.apmanager.Service.xml
+++ b/dbus_bindings/org.chromium.apmanager.Service.dbus-xml
diff --git a/device.h b/device.h
index f57c4eb..de54713 100644
--- a/device.h
+++ b/device.h
@@ -26,7 +26,7 @@
 #include <shill/net/byte_string.h>
 #include <shill/net/nl80211_message.h>
 
-#include "apmanager/dbus_adaptors/org.chromium.apmanager.Device.h"
+#include "dbus_bindings/org.chromium.apmanager.Device.h"
 
 namespace apmanager {
 
diff --git a/manager.h b/manager.h
index e3b8ab5..1625f1c 100644
--- a/manager.h
+++ b/manager.h
@@ -24,12 +24,11 @@
 #include <base/macros.h>
 #include <chromeos/dbus/dbus_service_watcher.h>
 
-#include "apmanager/dbus_adaptors/org.chromium.apmanager.Manager.h"
-
 #include "apmanager/device_info.h"
 #include "apmanager/firewall_manager.h"
 #include "apmanager/service.h"
 #include "apmanager/shill_proxy.h"
+#include "dbus_bindings/org.chromium.apmanager.Manager.h"
 
 namespace apmanager {
 
diff --git a/service.h b/service.h
index 07c6fc7..d87c2b4 100644
--- a/service.h
+++ b/service.h
@@ -23,11 +23,11 @@
 #include <chromeos/process.h>
 
 #include "apmanager/config.h"
-#include "apmanager/dbus_adaptors/org.chromium.apmanager.Service.h"
 #include "apmanager/dhcp_server_factory.h"
 #include "apmanager/file_writer.h"
 #include "apmanager/hostapd_monitor.h"
 #include "apmanager/process_factory.h"
+#include "dbus_bindings/org.chromium.apmanager.Service.h"
 
 namespace apmanager {