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

Side by Side Diff: net/net.gyp

Issue 896203003: Implement utility-side proxy resolver Mojo service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@proxy-diffbase
Patch Set: Created 5 years, 10 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 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 'proxy/proxy_resolver_v8_unittest.cc', 705 'proxy/proxy_resolver_v8_unittest.cc',
706 'proxy/proxy_resolver_v8_tracing_unittest.cc', 706 'proxy/proxy_resolver_v8_tracing_unittest.cc',
707 ], 707 ],
708 }, 708 },
709 ], 709 ],
710 710
711 [ 'use_v8_in_net==1 and OS != "android"', { 711 [ 'use_v8_in_net==1 and OS != "android"', {
712 'dependencies': [ 712 'dependencies': [
713 'net_with_v8', 713 'net_with_v8',
714 'net_browser_services', 714 'net_browser_services',
715 'net_utility_services',
715 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 716 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
716 ], 717 ],
717 }, { # else 718 }, { # else
718 'sources!': [ 719 'sources!': [
719 'dns/mojo_host_resolver_impl_unittest.cc', 720 'dns/mojo_host_resolver_impl_unittest.cc',
721 'proxy/mojo_proxy_resolver_impl_unittest.cc',
720 ], 722 ],
721 }, 723 },
722 ], 724 ],
723 725
724 [ 'enable_mdns != 1', { 726 [ 'enable_mdns != 1', {
725 'sources!' : [ 727 'sources!' : [
726 'dns/mdns_cache_unittest.cc', 728 'dns/mdns_cache_unittest.cc',
727 'dns/mdns_client_unittest.cc', 729 'dns/mdns_client_unittest.cc',
728 'dns/mdns_query_unittest.cc', 730 'dns/mdns_query_unittest.cc',
729 'dns/record_parsed_unittest.cc', 731 'dns/record_parsed_unittest.cc',
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 ], 1243 ],
1242 'dependencies': [ 1244 'dependencies': [
1243 'net', 1245 'net',
1244 'net_interfaces', 1246 'net_interfaces',
1245 'type_converters', 1247 'type_converters',
1246 '../mojo/mojo_base.gyp:mojo_environment_chromium', 1248 '../mojo/mojo_base.gyp:mojo_environment_chromium',
1247 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 1249 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
1248 ], 1250 ],
1249 }, 1251 },
1250 { 1252 {
1253 # GN version: //net:net_utility_services
1254 'target_name': 'net_utility_services',
1255 'type': 'static_library',
1256 'sources': [
1257 'proxy/mojo_proxy_resolver_impl.cc',
1258 'proxy/mojo_proxy_resolver_impl.h',
1259 ],
1260 'dependencies': [
1261 'net',
1262 'net_interfaces',
1263 'type_converters',
1264 '../mojo/mojo_base.gyp:mojo_common_lib',
1265 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
1266 ],
1267 },
1268 {
1251 # GN version: //net:type_converters 1269 # GN version: //net:type_converters
1252 'target_name': 'type_converters', 1270 'target_name': 'type_converters',
1253 'type': 'static_library', 1271 'type': 'static_library',
1254 'sources': [ 1272 'sources': [
1255 'dns/type_converters.cc', 1273 'dns/type_converters.cc',
1256 'dns/type_converters.h', 1274 'dns/type_converters.h',
1275 'proxy/mojo_type_converters.cc',
1276 'proxy/mojo_type_converters.h',
1257 ], 1277 ],
1258 'dependencies': [ 1278 'dependencies': [
1259 'net', 1279 'net',
1260 'net_interfaces', 1280 'net_interfaces',
1261 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 1281 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
1262 ], 1282 ],
1263 }, 1283 },
1264 ], 1284 ],
1265 }], 1285 }],
1266 ['OS != "ios" and OS != "android"', { 1286 ['OS != "ios" and OS != "android"', {
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1809 '../build/isolate.gypi', 1829 '../build/isolate.gypi',
1810 ], 1830 ],
1811 'sources': [ 1831 'sources': [
1812 'net_unittests.isolate', 1832 'net_unittests.isolate',
1813 ], 1833 ],
1814 }, 1834 },
1815 ], 1835 ],
1816 }], 1836 }],
1817 ], 1837 ],
1818 } 1838 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698