Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1538)

Unified Diff: third_party/mojo/mojo_public.gyp

Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge IPC fixes Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/mojo/mojo_public.gyp
diff --git a/third_party/mojo/mojo_public.gyp b/third_party/mojo/mojo_public.gyp
index 673e1c42cbb5335f5c501f2923ad0391196ccf6b..3658d16829fa1a255c875f9e71516462ef9dbdce 100644
--- a/third_party/mojo/mojo_public.gyp
+++ b/third_party/mojo/mojo_public.gyp
@@ -100,6 +100,10 @@
'src/mojo/public/cpp/bindings/lib/callback_internal.h',
'src/mojo/public/cpp/bindings/lib/connector.cc',
'src/mojo/public/cpp/bindings/lib/connector.h',
+ 'src/mojo/public/cpp/bindings/lib/control_message_handler.cc',
+ 'src/mojo/public/cpp/bindings/lib/control_message_handler.h',
+ 'src/mojo/public/cpp/bindings/lib/control_message_proxy.cc',
+ 'src/mojo/public/cpp/bindings/lib/control_message_proxy.h',
'src/mojo/public/cpp/bindings/lib/filter_chain.cc',
'src/mojo/public/cpp/bindings/lib/filter_chain.h',
'src/mojo/public/cpp/bindings/lib/fixed_buffer.cc',
@@ -130,6 +134,9 @@
'src/mojo/public/cpp/bindings/lib/validation_util.cc',
'src/mojo/public/cpp/bindings/lib/validation_util.h',
],
+ 'dependencies': [
+ 'mojo_interface_bindings_generation',
+ ],
},
{
# GN version: //mojo/public/js
@@ -239,11 +246,13 @@
'src/mojo/public/cpp/application/lib/application_connection.cc',
'src/mojo/public/cpp/application/lib/application_delegate.cc',
'src/mojo/public/cpp/application/lib/application_impl.cc',
+ 'src/mojo/public/cpp/application/lib/interface_factory_connector.h',
+ 'src/mojo/public/cpp/application/lib/service_connector_registry.cc',
+ 'src/mojo/public/cpp/application/lib/service_connector_registry.h',
'src/mojo/public/cpp/application/lib/service_provider_impl.cc',
- 'src/mojo/public/cpp/application/lib/service_connector.cc',
- 'src/mojo/public/cpp/application/lib/service_connector.h',
'src/mojo/public/cpp/application/lib/service_registry.cc',
'src/mojo/public/cpp/application/lib/service_registry.h',
+ 'src/mojo/public/cpp/application/service_connector.h',
'src/mojo/public/cpp/application/service_provider_impl.h',
],
'dependencies': [
@@ -254,7 +263,7 @@
],
},
{
- # GN version: //mojo/public/cpp/application:standalone"
+ # GN version: //mojo/public/cpp/application:standalone
'target_name': 'mojo_application_standalone',
'type': 'static_library',
'sources': [
@@ -270,6 +279,41 @@
],
},
{
+ 'target_name': 'mojo_interface_bindings_mojom',
+ 'type': 'none',
+ 'variables': {
+ # Normally the mojom bindings generator rules introduce a dependency on
+ # this target; this avoids things getting circular.
+ 'require_interface_bindings': 0,
+ 'mojom_files': [
+ 'src/mojo/public/interfaces/bindings/interface_control_messages.mojom',
+ ],
+ },
+ 'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+ },
+ {
+ # This target exists only to guarantee that bindings are generated before
+ # mojo_cpp_bindings is built without also causing mojo_cpp_bindings to
+ # link against the generated sources.
+ 'target_name': 'mojo_interface_bindings_generation',
+ 'type': 'none',
+ 'dependencies': [
+ 'mojo_interface_bindings_mojom',
+ ],
+ },
+ {
+ # GN version: //mojo/public/interfaces/bindings
+ 'target_name': 'mojo_interface_bindings',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'mojo_cpp_bindings',
+ 'mojo_interface_bindings_mojom',
+ ],
+ 'export_dependent_settings': [
+ 'mojo_cpp_bindings',
+ ],
+ },
+ {
# GN version: //mojo/public/c/test_support
'target_name': 'mojo_test_support',
'defines': [
@@ -378,13 +422,14 @@
'includes': [ '../../build/java.gypi' ],
},
{
- # GN version: //mojo/public/java_bindings
+ # GN version: //mojo/public/java_bindings
'target_name': 'mojo_bindings_java',
'type': 'none',
'variables': {
'java_in_dir': 'src/mojo/public/java/bindings',
},
'dependencies': [
+ 'mojo_interface_bindings',
'mojo_public_java',
],
'includes': [ '../../build/java.gypi' ],

Powered by Google App Engine
This is Rietveld 408576698