| Index: mojo/public/mojo_public.gyp
|
| diff --git a/mojo/public/mojo_public.gyp b/mojo/public/mojo_public.gyp
|
| index 46f22f79ea2c3042bdb7d188f683cfa82dfa0f03..f19e263065d1c398f896d127842bb7dd269a3979 100644
|
| --- a/mojo/public/mojo_public.gyp
|
| +++ b/mojo/public/mojo_public.gyp
|
| @@ -70,6 +70,7 @@
|
| ],
|
| 'sources': [
|
| 'cpp/bindings/array.h',
|
| + 'cpp/bindings/binding.h',
|
| 'cpp/bindings/callback.h',
|
| 'cpp/bindings/error_handler.h',
|
| 'cpp/bindings/interface_impl.h',
|
| @@ -79,6 +80,7 @@
|
| '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',
|
| @@ -96,7 +98,6 @@
|
| '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',
|
| @@ -123,7 +124,7 @@
|
| ],
|
| },
|
| {
|
| - # GN version: //mojo/public/js/bindings
|
| + # GN version: //mojo/public/js
|
| 'target_name': 'mojo_js_bindings',
|
| 'type': 'static_library',
|
| 'include_dirs': [
|
| @@ -188,16 +189,23 @@
|
| ],
|
| },
|
| {
|
| + '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': [
|
| @@ -229,9 +237,11 @@
|
| ],
|
| 'dependencies': [
|
| 'mojo_application_bindings',
|
| + 'mojo_application_bindings_mojom',
|
| ],
|
| 'export_dependent_settings': [
|
| 'mojo_application_bindings',
|
| + 'mojo_application_bindings_mojom',
|
| ],
|
| },
|
| {
|
| @@ -313,28 +323,35 @@
|
| ],
|
| },
|
| {
|
| + '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',
|
| ],
|
| },
|
|
|