| 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 # 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 # Always need use_v8_in_net to be 1 to run gyp on Android, so just | 295 # Always need use_v8_in_net to be 1 to run gyp on Android, so just |
| 296 # remove net_unittest's dependency on v8 when using icu alternatives | 296 # remove net_unittest's dependency on v8 when using icu alternatives |
| 297 # instead of setting use_v8_in_net to 0. | 297 # instead of setting use_v8_in_net to 0. |
| 298 [ 'use_v8_in_net==1 and use_icu_alternatives_on_android==0', { | 298 [ 'use_v8_in_net==1 and use_icu_alternatives_on_android==0', { |
| 299 'dependencies': [ | 299 'dependencies': [ |
| 300 'net_with_v8', | 300 'net_with_v8', |
| 301 ], | 301 ], |
| 302 }, { # else: !use_v8_in_net | 302 }, { # else: !use_v8_in_net |
| 303 'sources!': [ | 303 'sources!': [ |
| 304 'proxy/proxy_resolver_v8_tracing_unittest.cc', | 304 'proxy/proxy_resolver_v8_tracing_unittest.cc', |
| 305 'proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc', |
| 305 'proxy/proxy_resolver_v8_unittest.cc', | 306 'proxy/proxy_resolver_v8_unittest.cc', |
| 306 ], | 307 ], |
| 307 }, | 308 }, |
| 308 ], | 309 ], |
| 309 | 310 |
| 310 [ 'use_v8_in_net==1 and OS != "android"', { | 311 [ 'use_v8_in_net==1 and OS != "android"', { |
| 311 'dependencies': [ | 312 'dependencies': [ |
| 312 'net_with_v8', | 313 'net_with_v8', |
| 313 'net_browser_services', | 314 'net_browser_services', |
| 314 'net_utility_services', | 315 'net_utility_services', |
| 315 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', | 316 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', |
| 316 ], | 317 ], |
| 317 }, { # else | 318 }, { # else |
| 318 'sources!': [ | 319 'sources!': [ |
| 319 'dns/host_resolver_mojo_unittest.cc', | 320 'dns/host_resolver_mojo_unittest.cc', |
| 320 'dns/mojo_host_resolver_impl_unittest.cc', | 321 'dns/mojo_host_resolver_impl_unittest.cc', |
| 321 'proxy/load_state_change_coalescer_unittest.cc', | |
| 322 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', | 322 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', |
| 323 'proxy/mojo_proxy_resolver_impl_unittest.cc', | 323 'proxy/mojo_proxy_resolver_impl_unittest.cc', |
| 324 'proxy/proxy_resolver_error_observer_mojo_unittest.cc', | 324 'proxy/proxy_resolver_error_observer_mojo_unittest.cc', |
| 325 'proxy/proxy_resolver_factory_mojo_unittest.cc', | 325 'proxy/proxy_resolver_factory_mojo_unittest.cc', |
| 326 'proxy/proxy_service_mojo_unittest.cc', | 326 'proxy/proxy_service_mojo_unittest.cc', |
| 327 ], | 327 ], |
| 328 }, | 328 }, |
| 329 ], | 329 ], |
| 330 | 330 |
| 331 [ 'enable_mdns != 1', { | 331 [ 'enable_mdns != 1', { |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 860 'net' | 860 'net' |
| 861 ], | 861 ], |
| 862 'defines': [ | 862 'defines': [ |
| 863 'NET_IMPLEMENTATION', | 863 'NET_IMPLEMENTATION', |
| 864 ], | 864 ], |
| 865 'sources': [ | 865 'sources': [ |
| 866 'proxy/proxy_resolver_v8.cc', | 866 'proxy/proxy_resolver_v8.cc', |
| 867 'proxy/proxy_resolver_v8.h', | 867 'proxy/proxy_resolver_v8.h', |
| 868 'proxy/proxy_resolver_v8_tracing.cc', | 868 'proxy/proxy_resolver_v8_tracing.cc', |
| 869 'proxy/proxy_resolver_v8_tracing.h', | 869 'proxy/proxy_resolver_v8_tracing.h', |
| 870 'proxy/proxy_resolver_v8_tracing_wrapper.cc', |
| 871 'proxy/proxy_resolver_v8_tracing_wrapper.h', |
| 870 'proxy/proxy_service_v8.cc', | 872 'proxy/proxy_service_v8.cc', |
| 871 'proxy/proxy_service_v8.h', | 873 'proxy/proxy_service_v8.h', |
| 872 ], | 874 ], |
| 873 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 875 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 874 'msvs_disabled_warnings': [4267, ], | 876 'msvs_disabled_warnings': [4267, ], |
| 875 }, | 877 }, |
| 876 ], | 878 ], |
| 877 }], | 879 }], |
| 878 ['use_v8_in_net == 1 and OS != "android"', { | 880 ['use_v8_in_net == 1 and OS != "android"', { |
| 879 'targets': [ | 881 'targets': [ |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 'net_utility_services', | 923 'net_utility_services', |
| 922 ], | 924 ], |
| 923 }, | 925 }, |
| 924 { | 926 { |
| 925 # GN version: //net:net_utility_services | 927 # GN version: //net:net_utility_services |
| 926 'target_name': 'net_utility_services', | 928 'target_name': 'net_utility_services', |
| 927 'type': 'static_library', | 929 'type': 'static_library', |
| 928 'sources': [ | 930 'sources': [ |
| 929 'dns/host_resolver_mojo.cc', | 931 'dns/host_resolver_mojo.cc', |
| 930 'dns/host_resolver_mojo.h', | 932 'dns/host_resolver_mojo.h', |
| 931 'proxy/load_state_change_coalescer.cc', | |
| 932 'proxy/load_state_change_coalescer.h', | |
| 933 'proxy/mojo_proxy_resolver_factory_impl.cc', | 933 'proxy/mojo_proxy_resolver_factory_impl.cc', |
| 934 'proxy/mojo_proxy_resolver_factory_impl.h', | 934 'proxy/mojo_proxy_resolver_factory_impl.h', |
| 935 'proxy/mojo_proxy_resolver_impl.cc', | 935 'proxy/mojo_proxy_resolver_impl.cc', |
| 936 'proxy/mojo_proxy_resolver_impl.h', | 936 'proxy/mojo_proxy_resolver_impl.h', |
| 937 'proxy/proxy_resolver_error_observer_mojo.cc', | 937 'proxy/proxy_resolver_error_observer_mojo.cc', |
| 938 'proxy/proxy_resolver_error_observer_mojo.h', | 938 'proxy/proxy_resolver_error_observer_mojo.h', |
| 939 ], | 939 ], |
| 940 'dependencies': [ | 940 'dependencies': [ |
| 941 'mojo_type_converters', | 941 'mojo_type_converters', |
| 942 'net_interfaces', | 942 'net_interfaces', |
| (...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1555 '../build/isolate.gypi', | 1555 '../build/isolate.gypi', |
| 1556 ], | 1556 ], |
| 1557 'sources': [ | 1557 'sources': [ |
| 1558 'net_unittests.isolate', | 1558 'net_unittests.isolate', |
| 1559 ], | 1559 ], |
| 1560 }, | 1560 }, |
| 1561 ], | 1561 ], |
| 1562 }], | 1562 }], |
| 1563 ], | 1563 ], |
| 1564 } | 1564 } |
| OLD | NEW |