Commit 8f48e07c authored by jamesr@chromium.org's avatar jamesr@chromium.org

export hard dependencies where needed in mojo

mojo/application_manager/application_loader.h #includes a generated
header from mojo_network_bindings. This means any target that uses this
header (and thus depends on application_manager) must declare a hard
dependency on mojo_network_bindings so that the generated header exists
before that target tries to compile. This exports the hard dep (via
gyp's export_dependent_settings) and from other targets with similar needs.

R=viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/496813002

Cr-Commit-Position: refs/heads/master@{#291273}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291273 0039d316-1c4b-4281-b951-d872f2087c98
parent d7ca4a94
...@@ -333,6 +333,7 @@ ...@@ -333,6 +333,7 @@
'export_dependent_settings': [ 'export_dependent_settings': [
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'mojo_base.gyp:mojo_application_bindings', 'mojo_base.gyp:mojo_application_bindings',
'mojo_network_bindings',
], ],
}, },
{ {
......
...@@ -399,6 +399,9 @@ ...@@ -399,6 +399,9 @@
'GLES2_USE_MOJO', 'GLES2_USE_MOJO',
], ],
}, },
'export_dependent_settings': [
'mojo_gles2_bindings',
],
'sources': [ 'sources': [
'gles2/command_buffer_client_impl.cc', 'gles2/command_buffer_client_impl.cc',
'gles2/command_buffer_client_impl.h', 'gles2/command_buffer_client_impl.h',
......
...@@ -97,10 +97,11 @@ ...@@ -97,10 +97,11 @@
'services/public/interfaces/input_events/input_events.mojom', 'services/public/interfaces/input_events/input_events.mojom',
], ],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [ 'dependencies': [
'mojo_base.gyp:mojo_cpp_bindings', 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings',
], ],
'dependencies': [ 'export_dependent_settings': [
'mojo_base.gyp:mojo_cpp_bindings', 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings', 'mojo_geometry_bindings',
], ],
...@@ -165,6 +166,7 @@ ...@@ -165,6 +166,7 @@
], ],
'export_dependent_settings': [ 'export_dependent_settings': [
'mojo_geometry_lib', 'mojo_geometry_lib',
'mojo_surfaces_bindings',
], ],
'sources': [ 'sources': [
'services/public/cpp/surfaces/lib/surfaces_type_converters.cc', 'services/public/cpp/surfaces/lib/surfaces_type_converters.cc',
...@@ -225,10 +227,12 @@ ...@@ -225,10 +227,12 @@
'services/public/interfaces/gpu/gpu.mojom', 'services/public/interfaces/gpu/gpu.mojom',
], ],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [ 'dependencies': [
'mojo_base.gyp:mojo_cpp_bindings', 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_base.gyp:mojo_gles2_bindings',
'mojo_geometry_bindings',
], ],
'dependencies': [ 'export_dependent_settings': [
'mojo_base.gyp:mojo_cpp_bindings', 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_base.gyp:mojo_gles2_bindings', 'mojo_base.gyp:mojo_gles2_bindings',
'mojo_geometry_bindings', 'mojo_geometry_bindings',
...@@ -242,10 +246,13 @@ ...@@ -242,10 +246,13 @@
'services/public/interfaces/native_viewport/native_viewport.mojom', 'services/public/interfaces/native_viewport/native_viewport.mojom',
], ],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [ 'dependencies': [
'mojo_base.gyp:mojo_cpp_bindings', 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_base.gyp:mojo_gles2_bindings',
'mojo_geometry_bindings',
'mojo_input_events_bindings',
], ],
'dependencies': [ 'export_dependent_settings': [
'mojo_base.gyp:mojo_cpp_bindings', 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_base.gyp:mojo_gles2_bindings', 'mojo_base.gyp:mojo_gles2_bindings',
'mojo_geometry_bindings', 'mojo_geometry_bindings',
...@@ -272,6 +279,11 @@ ...@@ -272,6 +279,11 @@
'mojo_input_events_lib', 'mojo_input_events_lib',
'mojo_native_viewport_bindings', 'mojo_native_viewport_bindings',
], ],
'export_dependent_settings': [
'mojo_geometry_bindings',
'mojo_gpu_bindings',
'mojo_native_viewport_bindings',
],
'sources': [ 'sources': [
'services/native_viewport/gpu_impl.cc', 'services/native_viewport/gpu_impl.cc',
'services/native_viewport/gpu_impl.h', 'services/native_viewport/gpu_impl.h',
...@@ -481,10 +493,13 @@ ...@@ -481,10 +493,13 @@
'services/public/interfaces/view_manager/view_manager_constants.mojom', 'services/public/interfaces/view_manager/view_manager_constants.mojom',
], ],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [ 'dependencies': [
'mojo_base.gyp:mojo_application_bindings',
'mojo_base.gyp:mojo_cpp_bindings', 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings',
'mojo_input_events_bindings',
], ],
'dependencies': [ 'export_dependent_settings': [
'mojo_base.gyp:mojo_application_bindings', 'mojo_base.gyp:mojo_application_bindings',
'mojo_base.gyp:mojo_cpp_bindings', 'mojo_base.gyp:mojo_cpp_bindings',
'mojo_geometry_bindings', 'mojo_geometry_bindings',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment