Revert of Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480

mojo/public/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',
   ],
   'targets': [
     {
@@ skipping 52 matching lines @@
     },
     {
       # GN version: //mojo/public/cpp/bindings
       'target_name': 'mojo_cpp_bindings',
       'type': 'static_library',
       'include_dirs': [
         '../..'
       ],
       'sources': [
         'cpp/bindings/array.h',
-        'cpp/bindings/binding.h',
         'cpp/bindings/callback.h',
         'cpp/bindings/error_handler.h',
         'cpp/bindings/interface_impl.h',
         'cpp/bindings/interface_ptr.h',
         'cpp/bindings/interface_request.h',
         'cpp/bindings/message.h',
         'cpp/bindings/message_filter.h',
         'cpp/bindings/no_interface.h',
         'cpp/bindings/string.h',
-        'cpp/bindings/strong_binding.h',
         'cpp/bindings/type_converter.h',
         'cpp/bindings/lib/array_internal.h',
         'cpp/bindings/lib/array_internal.cc',
         'cpp/bindings/lib/array_serialization.h',
         'cpp/bindings/lib/bindings_internal.h',
         'cpp/bindings/lib/bindings_serialization.cc',
         'cpp/bindings/lib/bindings_serialization.h',
         'cpp/bindings/lib/bounds_checker.cc',
         'cpp/bindings/lib/bounds_checker.h',
         'cpp/bindings/lib/buffer.h',
         'cpp/bindings/lib/callback_internal.h',
         'cpp/bindings/lib/connector.cc',
         'cpp/bindings/lib/connector.h',
         'cpp/bindings/lib/filter_chain.cc',
         'cpp/bindings/lib/filter_chain.h',
         'cpp/bindings/lib/fixed_buffer.cc',
         'cpp/bindings/lib/fixed_buffer.h',
+        'cpp/bindings/lib/interface_impl_internal.h',
         'cpp/bindings/lib/interface_ptr_internal.h',
         'cpp/bindings/lib/map_data_internal.h',
         'cpp/bindings/lib/map_internal.h',
         'cpp/bindings/lib/map_serialization.h',
         'cpp/bindings/lib/message.cc',
         'cpp/bindings/lib/message_builder.cc',
         'cpp/bindings/lib/message_builder.h',
         'cpp/bindings/lib/message_filter.cc',
         'cpp/bindings/lib/message_header_validator.cc',
         'cpp/bindings/lib/message_header_validator.h',
         'cpp/bindings/lib/message_internal.h',
         'cpp/bindings/lib/message_queue.cc',
         'cpp/bindings/lib/message_queue.h',
         'cpp/bindings/lib/no_interface.cc',
         'cpp/bindings/lib/router.cc',
         'cpp/bindings/lib/router.h',
         'cpp/bindings/lib/shared_data.h',
         'cpp/bindings/lib/shared_ptr.h',
         'cpp/bindings/lib/string_serialization.h',
         'cpp/bindings/lib/string_serialization.cc',
         'cpp/bindings/lib/validate_params.h',
         'cpp/bindings/lib/validation_errors.cc',
         'cpp/bindings/lib/validation_errors.h',
       ],
     },
     {
-      # GN version: //mojo/public/js
+      # GN version: //mojo/public/js/bindings
       'target_name': 'mojo_js_bindings',
       'type': 'static_library',
       'include_dirs': [
         '../..'
       ],
       'sources': [
         'js/constants.cc',
         'js/constants.h',
       ],
     },
@@ skipping 44 matching lines @@
             'cpp/utility/lib/mutex.cc',
             'cpp/utility/lib/thread.cc',
           ],
         }],
       ],
       'include_dirs': [
         '../..',
       ],
     },
     {
-      'target_name': 'mojo_application_bindings_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'interfaces/application/application.mojom',
-          'interfaces/application/service_provider.mojom',
-          'interfaces/application/shell.mojom',
-        ],
-      },
-      'includes': [ 'tools/bindings/mojom_bindings_generator_explicit.gypi' ],
-    },
-    {
       # GN version: //mojo/public/interfaces/application:application
       'target_name': 'mojo_application_bindings',
       'type': 'static_library',
+      'sources': [
+        'interfaces/application/application.mojom',
+        'interfaces/application/service_provider.mojom',
+        'interfaces/application/shell.mojom',
+      ],
+      'includes': [ 'tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
-        'mojo_application_bindings_mojom',
         'mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
     },
     {
       # GN version: //mojo/public/cpp/application
       'target_name': 'mojo_application_base',
       'type': 'static_library',
@@ skipping 95 matching lines @@
       'type': 'static_library',
       'dependencies': [
         '../../base/base.gyp:base',
       ],
       'sources': [
         'cpp/bindings/tests/validation_test_input_parser.cc',
         'cpp/bindings/tests/validation_test_input_parser.h',
       ],
     },
     {
-      'target_name': 'mojo_public_test_interfaces_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'interfaces/bindings/tests/math_calculator.mojom',
-          'interfaces/bindings/tests/no_module.mojom',
-          'interfaces/bindings/tests/rect.mojom',
-          'interfaces/bindings/tests/regression_tests.mojom',
-          'interfaces/bindings/tests/sample_factory.mojom',
-          'interfaces/bindings/tests/sample_import.mojom',
-          'interfaces/bindings/tests/sample_import2.mojom',
-          'interfaces/bindings/tests/sample_interfaces.mojom',
-          'interfaces/bindings/tests/sample_service.mojom',
-          'interfaces/bindings/tests/serialization_test_structs.mojom',
-          'interfaces/bindings/tests/test_structs.mojom',
-          'interfaces/bindings/tests/validation_test_interfaces.mojom',
-        ],
-      },
-      'includes': [ 'tools/bindings/mojom_bindings_generator_explicit.gypi' ],
-    },
-    {
       # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
       'target_name': 'mojo_public_test_interfaces',
       'type': 'static_library',
+      'sources': [
+        'interfaces/bindings/tests/math_calculator.mojom',
+        'interfaces/bindings/tests/no_module.mojom',
+        'interfaces/bindings/tests/rect.mojom',
+        'interfaces/bindings/tests/regression_tests.mojom',
+        'interfaces/bindings/tests/sample_factory.mojom',
+        'interfaces/bindings/tests/sample_import.mojom',
+        'interfaces/bindings/tests/sample_import2.mojom',
+        'interfaces/bindings/tests/sample_interfaces.mojom',
+        'interfaces/bindings/tests/sample_service.mojom',
+        'interfaces/bindings/tests/serialization_test_structs.mojom',
+        'interfaces/bindings/tests/test_structs.mojom',
+        'interfaces/bindings/tests/validation_test_interfaces.mojom',
+      ],
+      'includes': [ 'tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
       'dependencies': [
-        'mojo_public_test_interfaces_mojom',
         'mojo_cpp_bindings',
       ],
     },
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           # GN version: //mojo/public/java_system
           'target_name': 'mojo_public_java',
@@ skipping 12 matching lines @@
            },
            'dependencies': [
              'mojo_public_java',
            ],
            'includes': [ '../../build/java.gypi' ],
         },
       ],
     }],
   ],
 }