Split DBus headers generation on new .gyp files.
In order to split the client side DBus library from the ebuild with
the daemon, we need to split the DBus headers generation from the main
.gyp files.
CQ-DEPEND=CL:297331
BUG=b:23560718
TEST=./build_packages
Change-Id: I3657758ff763d7e1170d745ccd4215a4f979b44d
Reviewed-on: https://chromium-review.googlesource.com/296827
Commit-Ready: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
diff --git a/shill.gyp b/shill.gyp
index a143d54..7ed96a0 100644
--- a/shill.gyp
+++ b/shill.gyp
@@ -177,33 +177,6 @@
],
'includes': ['../common-mk/generate-dbus-adaptors.gypi'],
},
- # shill client library generated headers. Used by other daemons to
- # interact with shill.
- {
- 'target_name': 'libshill-client-headers',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'libshill-client-dbus-proxies',
- 'variables': {
- 'dbus_service_config': 'dbus_bindings/dbus-service-config.json',
- 'proxy_output_file': 'include/shill/dbus-proxies.h',
- 'mock_output_file': 'include/shill/dbus-proxy-mocks.h',
- 'proxy_path_in_mocks': 'shill/dbus-proxies.h',
- },
- 'sources': [
- 'dbus_bindings/org.chromium.flimflam.Device.xml',
- 'dbus_bindings/org.chromium.flimflam.IPConfig.xml',
- 'dbus_bindings/org.chromium.flimflam.Manager.xml',
- 'dbus_bindings/org.chromium.flimflam.Profile.xml',
- 'dbus_bindings/org.chromium.flimflam.Service.xml',
- 'dbus_bindings/org.chromium.flimflam.Task.xml',
- 'dbus_bindings/org.chromium.flimflam.ThirdPartyVpn.xml',
- ],
- 'includes': ['../common-mk/generate-dbus-proxies.gypi'],
- },
- ]
- },
{
'target_name': 'shim-protos',
'type': 'static_library',
@@ -1059,9 +1032,11 @@
{
'target_name': 'shill_setup_wifi',
'type': 'executable',
- 'dependencies': [
- 'libshill-client-headers',
- ],
+ 'variables': {
+ 'deps': [
+ 'libshill-client',
+ ],
+ },
'sources': [
'setup_wifi/main.cc'
],