Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90

third_party/mojo/mojo_public.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     'mojo_variables.gypi',
   ],
   'target_defaults' : {
     'include_dirs': [
@@ skipping 82 matching lines @@
         'src/mojo/public/cpp/bindings/lib/array_serialization.h',
         'src/mojo/public/cpp/bindings/lib/bindings_internal.h',
         'src/mojo/public/cpp/bindings/lib/bindings_serialization.cc',
         'src/mojo/public/cpp/bindings/lib/bindings_serialization.h',
         'src/mojo/public/cpp/bindings/lib/bounds_checker.cc',
         'src/mojo/public/cpp/bindings/lib/bounds_checker.h',
         'src/mojo/public/cpp/bindings/lib/buffer.h',
         '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',
         'src/mojo/public/cpp/bindings/lib/fixed_buffer.h',
         'src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h',
         'src/mojo/public/cpp/bindings/lib/map_data_internal.h',
         'src/mojo/public/cpp/bindings/lib/map_internal.h',
         'src/mojo/public/cpp/bindings/lib/map_serialization.h',
         'src/mojo/public/cpp/bindings/lib/message.cc',
         'src/mojo/public/cpp/bindings/lib/message_builder.cc',
         'src/mojo/public/cpp/bindings/lib/message_builder.h',
         'src/mojo/public/cpp/bindings/lib/message_filter.cc',
         'src/mojo/public/cpp/bindings/lib/message_header_validator.cc',
         'src/mojo/public/cpp/bindings/lib/message_header_validator.h',
         'src/mojo/public/cpp/bindings/lib/message_internal.h',
         'src/mojo/public/cpp/bindings/lib/message_queue.cc',
         'src/mojo/public/cpp/bindings/lib/message_queue.h',
         'src/mojo/public/cpp/bindings/lib/no_interface.cc',
         'src/mojo/public/cpp/bindings/lib/router.cc',
         'src/mojo/public/cpp/bindings/lib/router.h',
         'src/mojo/public/cpp/bindings/lib/shared_data.h',
         'src/mojo/public/cpp/bindings/lib/shared_ptr.h',
         'src/mojo/public/cpp/bindings/lib/string_serialization.h',
         'src/mojo/public/cpp/bindings/lib/string_serialization.cc',
         'src/mojo/public/cpp/bindings/lib/validate_params.h',
         'src/mojo/public/cpp/bindings/lib/validation_errors.cc',
         'src/mojo/public/cpp/bindings/lib/validation_errors.h',
         'src/mojo/public/cpp/bindings/lib/validation_util.cc',
         'src/mojo/public/cpp/bindings/lib/validation_util.h',
+        # This comes from the mojo_interface_bindings_cpp_sources dependency.
+        '>@(mojom_generated_sources)',
+      ],
+      'dependencies': [
+        'mojo_interface_bindings_cpp_sources',
       ],
     },
     {
       # GN version: //mojo/public/js
       'target_name': 'mojo_js_bindings',
       'type': 'static_library',
       'include_dirs': [
         '../..'
       ],
       'sources': [
@@ skipping 90 matching lines @@
       'sources': [
         'src/mojo/public/cpp/application/application_connection.h',
         'src/mojo/public/cpp/application/application_delegate.h',
         'src/mojo/public/cpp/application/application_impl.h',
         'src/mojo/public/cpp/application/connect.h',
         'src/mojo/public/cpp/application/interface_factory.h',
         'src/mojo/public/cpp/application/interface_factory_impl.h',
         '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': [
         'mojo_application_bindings',
       ],
       'export_dependent_settings': [
         'mojo_application_bindings',
       ],
     },
     {
-      # GN version: //mojo/public/cpp/application:standalone"
+      # GN version: //mojo/public/cpp/application:standalone
       'target_name': 'mojo_application_standalone',
       'type': 'static_library',
       'sources': [
         'src/mojo/public/cpp/application/lib/application_runner.cc',
         'src/mojo/public/cpp/application/application_runner.h',
       ],
       'dependencies': [
         'mojo_application_base',
         'mojo_environment_standalone',
       ],
       'export_dependent_settings': [
         'mojo_application_base',
       ],
     },
     {
+      'target_name': 'mojo_interface_bindings_mojom',
+      'type': 'none',
+      'variables': {
+        'require_interface_bindings': 0,
+        'mojom_files': [
+          'src/mojo/public/interfaces/bindings/interface_control_messages.mojom',
+        ],
+      },
+      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
+      'target_name': 'mojo_interface_bindings_cpp_sources',
+      'type': 'none',
+      'dependencies': [
+        'mojo_interface_bindings_mojom',
+      ],
+    },
+    {
+      # This target can be used to introduce a dependency on interface bindings
+      # generation without introducing any side-effects in the dependent
+      # target's configuration.
+      'target_name': 'mojo_interface_bindings_generation',
+      'type': 'none',
+      'dependencies': [
+        'mojo_interface_bindings_cpp_sources',
+      ],
+    },
+    {
       # GN version: //mojo/public/c/test_support
       'target_name': 'mojo_test_support',
       'defines': [
         'MOJO_TEST_SUPPORT_IMPLEMENTATION',
       ],
       'include_dirs': [
         '../..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ skipping 79 matching lines @@
       'dependencies': [
         'mojo_public_test_interfaces_mojom',
         'mojo_cpp_bindings',
       ],
     },
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
-          # GN version: //mojo/public/java_system
+          # GN version: //mojo/public/java:system
           'target_name': 'mojo_public_java',
           'type': 'none',
           'variables': {
             'java_in_dir': 'src/mojo/public/java/system',
           },
           'includes': [ '../../build/java.gypi' ],
         },
         {
-        # GN version: //mojo/public/java_bindings
+          'target_name': 'mojo_interface_bindings_java_sources',
+          'type': 'none',
+          'dependencies': [
+            'mojo_interface_bindings_mojom',
+          ],
+        },
+        {
+          # 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_java_sources',
              'mojo_public_java',
            ],
            'includes': [ '../../build/java.gypi' ],
         },
       ],
     }],
   ],
 }