Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index db506c6e31f77fef2cca3369d4963b337fd8a321..73c577684aa72a5b6587354bd39fb450a18ca326 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -917,12 +917,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', |
], |
}, |
@@ -946,7 +952,6 @@ |
'proxy/proxy_service_mojo.h', |
], |
'dependencies': [ |
- 'mojo_type_converters', |
'net', |
'net_interfaces', |
'../mojo/mojo_base.gyp:mojo_common_lib', |
@@ -974,28 +979,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"', { |