| 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 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 'net_utility_services', | 716 'net_utility_services', |
| 717 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', | 717 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', |
| 718 ], | 718 ], |
| 719 }, { # else | 719 }, { # else |
| 720 'sources!': [ | 720 'sources!': [ |
| 721 'dns/host_resolver_mojo_unittest.cc', | 721 'dns/host_resolver_mojo_unittest.cc', |
| 722 'dns/mojo_host_resolver_impl_unittest.cc', | 722 'dns/mojo_host_resolver_impl_unittest.cc', |
| 723 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', | 723 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', |
| 724 'proxy/mojo_proxy_resolver_impl_unittest.cc', | 724 'proxy/mojo_proxy_resolver_impl_unittest.cc', |
| 725 'proxy/proxy_resolver_mojo_unittest.cc', | 725 'proxy/proxy_resolver_mojo_unittest.cc', |
| 726 'proxy/proxy_service_mojo_unittest.cc', |
| 726 ], | 727 ], |
| 727 }, | 728 }, |
| 728 ], | 729 ], |
| 729 | 730 |
| 730 [ 'enable_mdns != 1', { | 731 [ 'enable_mdns != 1', { |
| 731 'sources!' : [ | 732 'sources!' : [ |
| 732 'dns/mdns_cache_unittest.cc', | 733 'dns/mdns_cache_unittest.cc', |
| 733 'dns/mdns_client_unittest.cc', | 734 'dns/mdns_client_unittest.cc', |
| 734 'dns/mdns_query_unittest.cc', | 735 'dns/mdns_query_unittest.cc', |
| 735 'dns/record_parsed_unittest.cc', | 736 'dns/record_parsed_unittest.cc', |
| (...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1271 '../third_party/mojo/mojom_bindings_generator.gypi', | 1272 '../third_party/mojo/mojom_bindings_generator.gypi', |
| 1272 ], | 1273 ], |
| 1273 }, | 1274 }, |
| 1274 { | 1275 { |
| 1275 # GN version: //net:net_browser_services | 1276 # GN version: //net:net_browser_services |
| 1276 'target_name': 'net_browser_services', | 1277 'target_name': 'net_browser_services', |
| 1277 'type': 'static_library', | 1278 'type': 'static_library', |
| 1278 'sources': [ | 1279 'sources': [ |
| 1279 'dns/mojo_host_resolver_impl.cc', | 1280 'dns/mojo_host_resolver_impl.cc', |
| 1280 'dns/mojo_host_resolver_impl.h', | 1281 'dns/mojo_host_resolver_impl.h', |
| 1282 'proxy/in_process_mojo_proxy_resolver_factory.cc', |
| 1283 'proxy/in_process_mojo_proxy_resolver_factory.h', |
| 1281 'proxy/mojo_proxy_resolver_factory.h', | 1284 'proxy/mojo_proxy_resolver_factory.h', |
| 1282 'proxy/proxy_resolver_mojo.cc', | 1285 'proxy/proxy_resolver_mojo.cc', |
| 1283 'proxy/proxy_resolver_mojo.h', | 1286 'proxy/proxy_resolver_mojo.h', |
| 1287 'proxy/proxy_service_mojo.cc', |
| 1288 'proxy/proxy_service_mojo.h', |
| 1284 ], | 1289 ], |
| 1285 'dependencies': [ | 1290 'dependencies': [ |
| 1286 'mojo_type_converters', | 1291 'mojo_type_converters', |
| 1287 'net', | 1292 'net', |
| 1288 'net_interfaces', | 1293 'net_interfaces', |
| 1289 '../mojo/mojo_base.gyp:mojo_common_lib', | 1294 '../mojo/mojo_base.gyp:mojo_common_lib', |
| 1290 '../mojo/mojo_base.gyp:mojo_environment_chromium', | 1295 '../mojo/mojo_base.gyp:mojo_environment_chromium', |
| 1291 '../mojo/mojo_base.gyp:mojo_url_type_converters', | 1296 '../mojo/mojo_base.gyp:mojo_url_type_converters', |
| 1292 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', | 1297 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', |
| 1298 |
| 1299 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we |
| 1300 # need this dependency since in_process_mojo_proxy_resolver_factory |
| 1301 # creates the utility process side Mojo services in the browser |
| 1302 # process. Ultimately, this will go away when we only support |
| 1303 # out-of-process. |
| 1304 'net_utility_services', |
| 1293 ], | 1305 ], |
| 1294 }, | 1306 }, |
| 1295 { | 1307 { |
| 1296 # GN version: //net:net_utility_services | 1308 # GN version: //net:net_utility_services |
| 1297 'target_name': 'net_utility_services', | 1309 'target_name': 'net_utility_services', |
| 1298 'type': 'static_library', | 1310 'type': 'static_library', |
| 1299 'sources': [ | 1311 'sources': [ |
| 1300 'dns/host_resolver_mojo.cc', | 1312 'dns/host_resolver_mojo.cc', |
| 1301 'dns/host_resolver_mojo.h', | 1313 'dns/host_resolver_mojo.h', |
| 1302 'proxy/mojo_proxy_resolver_factory_impl.cc', | 1314 'proxy/mojo_proxy_resolver_factory_impl.cc', |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1877 '../build/isolate.gypi', | 1889 '../build/isolate.gypi', |
| 1878 ], | 1890 ], |
| 1879 'sources': [ | 1891 'sources': [ |
| 1880 'net_unittests.isolate', | 1892 'net_unittests.isolate', |
| 1881 ], | 1893 ], |
| 1882 }, | 1894 }, |
| 1883 ], | 1895 ], |
| 1884 }], | 1896 }], |
| 1885 ], | 1897 ], |
| 1886 } | 1898 } |
| OLD | NEW |