summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2016-03-10 22:16:51 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-11 06:18:00 +0000
commit71a42d8ea237f636bc39b6048e7a228ee260e9f9 (patch)
treea9a731536fbdaa27b3816400db10de34de16da08 /mojo
parentcee7bebda0eda4ce9316e72459e33995b4bd4f12 (diff)
downloadchromium_src-71a42d8ea237f636bc39b6048e7a228ee260e9f9.zip
chromium_src-71a42d8ea237f636bc39b6048e7a228ee260e9f9.tar.gz
chromium_src-71a42d8ea237f636bc39b6048e7a228ee260e9f9.tar.bz2
Mojo shell: Fix exported GYP dependencies
This ensures that dependents on mojo_shell.gyp targets (which all expose shell mojom in their headers) also depend on shell bindings. Fixes gyp build flake. BUG=None TBR=ben@chromium.org Review URL: https://codereview.chromium.org/1779403002 Cr-Commit-Position: refs/heads/master@{#380554}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/mojo_shell.gyp9
1 files changed, 9 insertions, 0 deletions
diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp
index 360d01a..213857b 100644
--- a/mojo/mojo_shell.gyp
+++ b/mojo/mojo_shell.gyp
@@ -41,6 +41,9 @@
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/url/url.gyp:url_lib',
],
+ 'export_dependent_settings': [
+ '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
+ ],
}, {
'target_name': 'mojo_shell_unittests',
'type': 'executable',
@@ -86,6 +89,9 @@
'<(DEPTH)/mojo/mojo_platform_handle.gyp:platform_handle',
'<(DEPTH)/mojo/mojo_public.gyp:mojo_message_pump_lib',
],
+ 'export_dependent_settings': [
+ '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
+ ],
}, {
'target_name': 'mojo_runner_common_lib',
'type': 'static_library',
@@ -126,6 +132,9 @@
'<(DEPTH)/mojo/mojo_platform_handle.gyp:platform_handle',
'<(DEPTH)/mojo/mojo_public.gyp:mojo_message_pump_lib',
],
+ 'export_dependent_settings': [
+ '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_bindings',
+ ],
'conditions': [
['OS=="linux"', {
'sources': [