Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(671)

Side by Side Diff: net/net.gyp

Issue 910343003: Create an in-process v8 proxy resolver using Mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-pac-complete-patch
Patch Set: Address review comments. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 'net_utility_services', 714 'net_utility_services',
715 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 715 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
716 ], 716 ],
717 }, { # else 717 }, { # else
718 'sources!': [ 718 'sources!': [
719 'dns/host_resolver_mojo_unittest.cc', 719 'dns/host_resolver_mojo_unittest.cc',
720 'dns/mojo_host_resolver_impl_unittest.cc', 720 'dns/mojo_host_resolver_impl_unittest.cc',
721 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', 721 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc',
722 'proxy/mojo_proxy_resolver_impl_unittest.cc', 722 'proxy/mojo_proxy_resolver_impl_unittest.cc',
723 'proxy/proxy_resolver_mojo_unittest.cc', 723 'proxy/proxy_resolver_mojo_unittest.cc',
724 'proxy/proxy_service_mojo_unittest.cc',
724 ], 725 ],
725 }, 726 },
726 ], 727 ],
727 728
728 [ 'enable_mdns != 1', { 729 [ 'enable_mdns != 1', {
729 'sources!' : [ 730 'sources!' : [
730 'dns/mdns_cache_unittest.cc', 731 'dns/mdns_cache_unittest.cc',
731 'dns/mdns_client_unittest.cc', 732 'dns/mdns_client_unittest.cc',
732 'dns/mdns_query_unittest.cc', 733 'dns/mdns_query_unittest.cc',
733 'dns/record_parsed_unittest.cc', 734 'dns/record_parsed_unittest.cc',
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 '../third_party/mojo/mojom_bindings_generator.gypi', 1265 '../third_party/mojo/mojom_bindings_generator.gypi',
1265 ], 1266 ],
1266 }, 1267 },
1267 { 1268 {
1268 # GN version: //net:net_browser_services 1269 # GN version: //net:net_browser_services
1269 'target_name': 'net_browser_services', 1270 'target_name': 'net_browser_services',
1270 'type': 'static_library', 1271 'type': 'static_library',
1271 'sources': [ 1272 'sources': [
1272 'dns/mojo_host_resolver_impl.cc', 1273 'dns/mojo_host_resolver_impl.cc',
1273 'dns/mojo_host_resolver_impl.h', 1274 'dns/mojo_host_resolver_impl.h',
1275 'proxy/in_process_mojo_proxy_resolver_factory.cc',
1276 'proxy/in_process_mojo_proxy_resolver_factory.h',
1274 'proxy/mojo_proxy_resolver_factory.h', 1277 'proxy/mojo_proxy_resolver_factory.h',
1275 'proxy/proxy_resolver_mojo.cc', 1278 'proxy/proxy_resolver_mojo.cc',
1276 'proxy/proxy_resolver_mojo.h', 1279 'proxy/proxy_resolver_mojo.h',
1280 'proxy/proxy_service_mojo.cc',
1281 'proxy/proxy_service_mojo.h',
1277 ], 1282 ],
1278 'dependencies': [ 1283 'dependencies': [
1279 'mojo_type_converters', 1284 'mojo_type_converters',
1280 'net', 1285 'net',
1281 'net_interfaces', 1286 'net_interfaces',
1282 '../mojo/mojo_base.gyp:mojo_environment_chromium', 1287 '../mojo/mojo_base.gyp:mojo_environment_chromium',
1283 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 1288 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
1289
1290 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we
1291 # need this dependency since in_process_mojo_proxy_resolver_factory
1292 # creates the utility process side Mojo services in the browser
1293 # process. Ultimately, this will go away when we only support
1294 # out-of-process.
1295 'net_utility_services',
1284 ], 1296 ],
1285 }, 1297 },
1286 { 1298 {
1287 # GN version: //net:net_utility_services 1299 # GN version: //net:net_utility_services
1288 'target_name': 'net_utility_services', 1300 'target_name': 'net_utility_services',
1289 'type': 'static_library', 1301 'type': 'static_library',
1290 'sources': [ 1302 'sources': [
1291 'dns/host_resolver_mojo.cc', 1303 'dns/host_resolver_mojo.cc',
1292 'dns/host_resolver_mojo.h', 1304 'dns/host_resolver_mojo.h',
1293 'proxy/mojo_proxy_resolver_factory_impl.cc', 1305 'proxy/mojo_proxy_resolver_factory_impl.cc',
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
1867 '../build/isolate.gypi', 1879 '../build/isolate.gypi',
1868 ], 1880 ],
1869 'sources': [ 1881 'sources': [
1870 'net_unittests.isolate', 1882 'net_unittests.isolate',
1871 ], 1883 ],
1872 }, 1884 },
1873 ], 1885 ],
1874 }], 1886 }],
1875 ], 1887 ],
1876 } 1888 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698