StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Export include path to D-Bus headers for multilib builds"

Browse Source
This commit is contained in:
Peter Qiu
2015-10-15 04:00:38 +00:00
committed by Gerrit Code Review
parent 84c5ae5232 425e01996a
commit 7d3690eb35
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/binary.mk
View File

@@ -665,18 +665,20 @@ $(dbus_generated_headers) : $(dbus_service_config_path) $(DBUS_GENERATOR)
ifdef LOCAL_DBUS_PROXY_PREFIX ifdef LOCAL_DBUS_PROXY_PREFIX
$(dbus_generated_headers) : $(dbus_definition_paths) $(dbus_generated_headers) : $(dbus_definition_paths)
$(generate-dbus-proxies) $(generate-dbus-proxies)
else
$(dbus_generated_headers) : $(dbus_header_dir)/%.h : $(LOCAL_PATH)/%.dbus-xml
$(generate-dbus-adaptors)
endif # $(LOCAL_DBUS_PROXY_PREFIX)
endif # $(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_dbus_bindings_defined
ifdef LOCAL_DBUS_PROXY_PREFIX
# Auto-export the generated dbus proxy directory. # Auto-export the generated dbus proxy directory.
my_export_c_include_dirs += $(dbus_gen_dir)/include my_export_c_include_dirs += $(dbus_gen_dir)/include
my_c_includes += $(dbus_gen_dir)/include my_c_includes += $(dbus_gen_dir)/include
else else
$(dbus_generated_headers) : $(dbus_header_dir)/%.h : $(LOCAL_PATH)/%.dbus-xml
$(generate-dbus-adaptors)
my_export_c_include_dirs += $(dbus_header_dir) my_export_c_include_dirs += $(dbus_header_dir)
my_c_includes += $(dbus_header_dir) my_c_includes += $(dbus_header_dir)
endif # $(LOCAL_DBUS_PROXY_PREFIX) endif # $(LOCAL_DBUS_PROXY_PREFIX)
endif # $(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_dbus_bindings_defined
my_generated_sources += $(dbus_generated_headers) my_generated_sources += $(dbus_generated_headers)