Change .dbus.xml extension to .dbus-xml

Work around gyp's inability to handle compound extensions by expecting
a similar looking simple extension for XML files definine DBus
interfaces.  We'll need to rename these sources in the places we're
using them already.

Bug: 23380180
Change-Id: Ieb2050f3ef05456cd70de65c3e128d57a6a508f8

diff --git a/core/binary.mk b/core/binary.mk
index 61cdcfe..01c8858 100644 (file)
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -619,9 +619,9 @@ endif
 endif  # $(proto_sources) non-empty
 
 ###########################################################
-## Compile the .dbus.xml files to c++ headers
+## Compile the .dbus-xml files to c++ headers
 ###########################################################
-dbus_definitions := $(filter %.dbus.xml,$(my_src_files))
+dbus_definitions := $(filter %.dbus-xml,$(my_src_files))
 dbus_generated_headers :=
 ifneq ($(dbus_definitions),)
 
@@ -636,7 +636,7 @@ dbus_header_dir := $(dbus_gen_dir)/include/$(LOCAL_DBUS_PROXY_PREFIX)
 dbus_headers := dbus-proxies.h
 else
 dbus_header_dir := $(dbus_gen_dir)
-dbus_headers := $(patsubst %.dbus.xml,%.h,$(dbus_definitions))
+dbus_headers := $(patsubst %.dbus-xml,%.h,$(dbus_definitions))
 endif
 dbus_generated_headers := $(addprefix $(dbus_header_dir)/,$(dbus_headers))
 
@@ -655,7 +655,7 @@ $(dbus_generated_headers) : $(dbus_definition_paths)
 my_export_c_include_dirs += $(dbus_gen_dir)/include
 my_c_includes += $(dbus_gen_dir)/include
 else
-$(dbus_generated_headers) : $(dbus_header_dir)/%.h : $(LOCAL_PATH)/%.dbus.xml
+$(dbus_generated_headers) : $(dbus_header_dir)/%.h : $(LOCAL_PATH)/%.dbus-xml
        $(generate-dbus-adaptors)
 
 my_export_c_include_dirs += $(dbus_header_dir)

diff --git a/core/definitions.mk b/core/definitions.mk
index 36bb0d4..79831e0 100644 (file)
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -970,7 +970,7 @@ endef
 
 
 ######################################################################
-## Commands for generating DBus adaptors from .dbus.xml files.
+## Commands for generating DBus adaptors from .dbus-xml files.
 ######################################################################
 define generate-dbus-adaptors
 @echo "Generating DBus adaptors for $(PRIVATE_MODULE)"
@@ -982,7 +982,7 @@ $(hide) $(DBUS_GENERATOR) \
 endef
 
 ######################################################################
-## Commands for generating DBus proxies from .dbus.xml files.
+## Commands for generating DBus proxies from .dbus-xml files.
 ######################################################################
 define generate-dbus-proxies
 @echo "Generating DBus proxies for $(PRIVATE_MODULE)"
@@ -990,7 +990,7 @@ define generate-dbus-proxies
 $(hide) $(DBUS_GENERATOR) \
        --service-config=$(PRIVATE_DBUS_SERVICE_CONFIG) \
        --proxy=$@ \
-       $(filter %.dbus.xml,$^)
+       $(filter %.dbus-xml,$^)
 endef