| Index: net/net.gyp
|
| diff --git a/net/net.gyp b/net/net.gyp
|
| index dfeee21b7b3152fa1872ef72eb823da3aeaa01df..53af1d2c6f75cc926ce0610608e1a9635463a3d8 100644
|
| --- a/net/net.gyp
|
| +++ b/net/net.gyp
|
| @@ -919,12 +919,18 @@
|
| 'sources': [
|
| 'interfaces/host_resolver_service.mojom',
|
| 'interfaces/proxy_resolver_service.mojom',
|
| + 'dns/mojo_host_struct_traits.cc',
|
| + 'dns/mojo_host_struct_traits.h',
|
| + 'proxy/mojo_proxy_struct_traits.cc',
|
| + 'proxy/mojo_proxy_struct_traits.h',
|
| ],
|
| 'dependencies': [
|
| '../url/url.gyp:url_mojom',
|
| ],
|
| 'variables': {
|
| 'mojom_typemaps': [
|
| + 'interfaces/host_resolver.typemap',
|
| + 'interfaces/proxy_resolver.typemap',
|
| '../url/mojo/gurl.typemap',
|
| ],
|
| },
|
| @@ -948,7 +954,6 @@
|
| 'proxy/proxy_service_mojo.h',
|
| ],
|
| 'dependencies': [
|
| - 'mojo_type_converters',
|
| 'net',
|
| 'net_interfaces',
|
| '../mojo/mojo_base.gyp:mojo_common_lib',
|
| @@ -976,28 +981,11 @@
|
| 'proxy/mojo_proxy_resolver_v8_tracing_bindings.h',
|
| ],
|
| 'dependencies': [
|
| - 'mojo_type_converters',
|
| 'net_interfaces',
|
| 'net_with_v8',
|
| '../mojo/mojo_public.gyp:mojo_cpp_bindings',
|
| ],
|
| },
|
| - {
|
| - # GN version: //net:mojo_type_converters
|
| - 'target_name': 'mojo_type_converters',
|
| - 'type': 'static_library',
|
| - 'sources': [
|
| - 'dns/mojo_host_type_converters.cc',
|
| - 'dns/mojo_host_type_converters.h',
|
| - 'proxy/mojo_proxy_type_converters.cc',
|
| - 'proxy/mojo_proxy_type_converters.h',
|
| - ],
|
| - 'dependencies': [
|
| - 'net',
|
| - 'net_interfaces',
|
| - '../mojo/mojo_public.gyp:mojo_cpp_bindings',
|
| - ],
|
| - },
|
| ],
|
| }],
|
| ['OS != "ios" and OS != "android"', {
|
|
|