OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'chromium_code': 1, | 7 'chromium_code': 1, |
8 | 8 |
9 'linux_link_kerberos%': 0, | 9 'linux_link_kerberos%': 0, |
10 'conditions': [ | 10 'conditions': [ |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 'net_utility_services', | 289 'net_utility_services', |
290 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', | 290 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', |
291 ], | 291 ], |
292 }, { # else | 292 }, { # else |
293 'sources!': [ | 293 'sources!': [ |
294 'dns/host_resolver_mojo_unittest.cc', | 294 'dns/host_resolver_mojo_unittest.cc', |
295 'dns/mojo_host_resolver_impl_unittest.cc', | 295 'dns/mojo_host_resolver_impl_unittest.cc', |
296 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', | 296 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', |
297 'proxy/mojo_proxy_resolver_impl_unittest.cc', | 297 'proxy/mojo_proxy_resolver_impl_unittest.cc', |
298 'proxy/proxy_resolver_mojo_unittest.cc', | 298 'proxy/proxy_resolver_mojo_unittest.cc', |
| 299 'proxy/proxy_service_mojo_unittest.cc', |
299 ], | 300 ], |
300 }, | 301 }, |
301 ], | 302 ], |
302 | 303 |
303 [ 'enable_mdns != 1', { | 304 [ 'enable_mdns != 1', { |
304 'sources!' : [ | 305 'sources!' : [ |
305 'dns/mdns_cache_unittest.cc', | 306 'dns/mdns_cache_unittest.cc', |
306 'dns/mdns_client_unittest.cc', | 307 'dns/mdns_client_unittest.cc', |
307 'dns/mdns_query_unittest.cc', | 308 'dns/mdns_query_unittest.cc', |
308 'dns/record_parsed_unittest.cc', | 309 'dns/record_parsed_unittest.cc', |
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 '../third_party/mojo/mojom_bindings_generator.gypi', | 845 '../third_party/mojo/mojom_bindings_generator.gypi', |
845 ], | 846 ], |
846 }, | 847 }, |
847 { | 848 { |
848 # GN version: //net:net_browser_services | 849 # GN version: //net:net_browser_services |
849 'target_name': 'net_browser_services', | 850 'target_name': 'net_browser_services', |
850 'type': 'static_library', | 851 'type': 'static_library', |
851 'sources': [ | 852 'sources': [ |
852 'dns/mojo_host_resolver_impl.cc', | 853 'dns/mojo_host_resolver_impl.cc', |
853 'dns/mojo_host_resolver_impl.h', | 854 'dns/mojo_host_resolver_impl.h', |
| 855 'proxy/in_process_mojo_proxy_resolver_factory.cc', |
| 856 'proxy/in_process_mojo_proxy_resolver_factory.h', |
854 'proxy/mojo_proxy_resolver_factory.h', | 857 'proxy/mojo_proxy_resolver_factory.h', |
855 'proxy/proxy_resolver_mojo.cc', | 858 'proxy/proxy_resolver_mojo.cc', |
856 'proxy/proxy_resolver_mojo.h', | 859 'proxy/proxy_resolver_mojo.h', |
| 860 'proxy/proxy_service_mojo.cc', |
| 861 'proxy/proxy_service_mojo.h', |
857 ], | 862 ], |
858 'dependencies': [ | 863 'dependencies': [ |
859 'mojo_type_converters', | 864 'mojo_type_converters', |
860 'net', | 865 'net', |
861 'net_interfaces', | 866 'net_interfaces', |
862 '../mojo/mojo_base.gyp:mojo_common_lib', | 867 '../mojo/mojo_base.gyp:mojo_common_lib', |
863 '../mojo/mojo_base.gyp:mojo_environment_chromium', | 868 '../mojo/mojo_base.gyp:mojo_environment_chromium', |
864 '../mojo/mojo_base.gyp:mojo_url_type_converters', | 869 '../mojo/mojo_base.gyp:mojo_url_type_converters', |
865 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', | 870 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', |
| 871 |
| 872 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we |
| 873 # need this dependency since in_process_mojo_proxy_resolver_factory |
| 874 # creates the utility process side Mojo services in the browser |
| 875 # process. Ultimately, this will go away when we only support |
| 876 # out-of-process. |
| 877 'net_utility_services', |
866 ], | 878 ], |
867 }, | 879 }, |
868 { | 880 { |
869 # GN version: //net:net_utility_services | 881 # GN version: //net:net_utility_services |
870 'target_name': 'net_utility_services', | 882 'target_name': 'net_utility_services', |
871 'type': 'static_library', | 883 'type': 'static_library', |
872 'sources': [ | 884 'sources': [ |
873 'dns/host_resolver_mojo.cc', | 885 'dns/host_resolver_mojo.cc', |
874 'dns/host_resolver_mojo.h', | 886 'dns/host_resolver_mojo.h', |
875 'proxy/mojo_proxy_resolver_factory_impl.cc', | 887 'proxy/mojo_proxy_resolver_factory_impl.cc', |
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1465 '../build/isolate.gypi', | 1477 '../build/isolate.gypi', |
1466 ], | 1478 ], |
1467 'sources': [ | 1479 'sources': [ |
1468 'net_unittests.isolate', | 1480 'net_unittests.isolate', |
1469 ], | 1481 ], |
1470 }, | 1482 }, |
1471 ], | 1483 ], |
1472 }], | 1484 }], |
1473 ], | 1485 ], |
1474 } | 1486 } |
OLD | NEW |