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

Side by Side Diff: net/net.gyp

Issue 1145153004: Split ProxyResolverV8Tracing into an implementation and a wrapper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 # Defines an extra set of libs with an alternate copy of org.apache.http. 8 # Defines an extra set of libs with an alternate copy of org.apache.http.
9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed. 9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed.
10 'net_test_extra_libs': [], 10 'net_test_extra_libs': [],
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 'dependencies': [ 311 'dependencies': [
312 'net_with_v8', 312 'net_with_v8',
313 'net_browser_services', 313 'net_browser_services',
314 'net_utility_services', 314 'net_utility_services',
315 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 315 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
316 ], 316 ],
317 }, { # else 317 }, { # else
318 'sources!': [ 318 'sources!': [
319 'dns/host_resolver_mojo_unittest.cc', 319 'dns/host_resolver_mojo_unittest.cc',
320 'dns/mojo_host_resolver_impl_unittest.cc', 320 'dns/mojo_host_resolver_impl_unittest.cc',
321 'proxy/load_state_change_coalescer_unittest.cc',
322 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', 321 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc',
323 'proxy/mojo_proxy_resolver_impl_unittest.cc', 322 'proxy/mojo_proxy_resolver_impl_unittest.cc',
324 'proxy/proxy_resolver_error_observer_mojo_unittest.cc', 323 'proxy/proxy_resolver_error_observer_mojo_unittest.cc',
325 'proxy/proxy_resolver_factory_mojo_unittest.cc', 324 'proxy/proxy_resolver_factory_mojo_unittest.cc',
326 'proxy/proxy_service_mojo_unittest.cc', 325 'proxy/proxy_service_mojo_unittest.cc',
327 ], 326 ],
328 }, 327 },
329 ], 328 ],
330 329
331 [ 'enable_mdns != 1', { 330 [ 'enable_mdns != 1', {
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 'net' 856 'net'
858 ], 857 ],
859 'defines': [ 858 'defines': [
860 'NET_IMPLEMENTATION', 859 'NET_IMPLEMENTATION',
861 ], 860 ],
862 'sources': [ 861 'sources': [
863 'proxy/proxy_resolver_v8.cc', 862 'proxy/proxy_resolver_v8.cc',
864 'proxy/proxy_resolver_v8.h', 863 'proxy/proxy_resolver_v8.h',
865 'proxy/proxy_resolver_v8_tracing.cc', 864 'proxy/proxy_resolver_v8_tracing.cc',
866 'proxy/proxy_resolver_v8_tracing.h', 865 'proxy/proxy_resolver_v8_tracing.h',
866 'proxy/proxy_resolver_v8_tracing_wrapper.cc',
867 'proxy/proxy_resolver_v8_tracing_wrapper.h',
867 'proxy/proxy_service_v8.cc', 868 'proxy/proxy_service_v8.cc',
868 'proxy/proxy_service_v8.h', 869 'proxy/proxy_service_v8.h',
869 ], 870 ],
870 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 871 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
871 'msvs_disabled_warnings': [4267, ], 872 'msvs_disabled_warnings': [4267, ],
872 }, 873 },
873 ], 874 ],
874 }], 875 }],
875 ['use_v8_in_net == 1 and OS != "android"', { 876 ['use_v8_in_net == 1 and OS != "android"', {
876 'targets': [ 877 'targets': [
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 'net_utility_services', 919 'net_utility_services',
919 ], 920 ],
920 }, 921 },
921 { 922 {
922 # GN version: //net:net_utility_services 923 # GN version: //net:net_utility_services
923 'target_name': 'net_utility_services', 924 'target_name': 'net_utility_services',
924 'type': 'static_library', 925 'type': 'static_library',
925 'sources': [ 926 'sources': [
926 'dns/host_resolver_mojo.cc', 927 'dns/host_resolver_mojo.cc',
927 'dns/host_resolver_mojo.h', 928 'dns/host_resolver_mojo.h',
928 'proxy/load_state_change_coalescer.cc',
929 'proxy/load_state_change_coalescer.h',
930 'proxy/mojo_proxy_resolver_factory_impl.cc', 929 'proxy/mojo_proxy_resolver_factory_impl.cc',
931 'proxy/mojo_proxy_resolver_factory_impl.h', 930 'proxy/mojo_proxy_resolver_factory_impl.h',
932 'proxy/mojo_proxy_resolver_impl.cc', 931 'proxy/mojo_proxy_resolver_impl.cc',
933 'proxy/mojo_proxy_resolver_impl.h', 932 'proxy/mojo_proxy_resolver_impl.h',
934 'proxy/proxy_resolver_error_observer_mojo.cc', 933 'proxy/proxy_resolver_error_observer_mojo.cc',
935 'proxy/proxy_resolver_error_observer_mojo.h', 934 'proxy/proxy_resolver_error_observer_mojo.h',
936 ], 935 ],
937 'dependencies': [ 936 'dependencies': [
938 'mojo_type_converters', 937 'mojo_type_converters',
939 'net_interfaces', 938 'net_interfaces',
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 '../build/isolate.gypi', 1550 '../build/isolate.gypi',
1552 ], 1551 ],
1553 'sources': [ 1552 'sources': [
1554 'net_unittests.isolate', 1553 'net_unittests.isolate',
1555 ], 1554 ],
1556 }, 1555 },
1557 ], 1556 ],
1558 }], 1557 }],
1559 ], 1558 ],
1560 } 1559 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698