| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 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 import("//build/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") | 
| 6 import("//build/config/chromecast_build.gni") | 6 import("//build/config/chromecast_build.gni") | 
| 7 import("//build/config/compiler/compiler.gni") | 7 import("//build/config/compiler/compiler.gni") | 
| 8 import("//build/config/crypto.gni") | 8 import("//build/config/crypto.gni") | 
| 9 import("//build/config/features.gni") | 9 import("//build/config/features.gni") | 
| 10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") | 
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 95 | 95 | 
| 96 net_configs = [ | 96 net_configs = [ | 
| 97   ":net_internal_config", | 97   ":net_internal_config", | 
| 98   "//build/config:precompiled_headers", | 98   "//build/config:precompiled_headers", | 
| 99 | 99 | 
| 100   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 100   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 
| 101   "//build/config/compiler:no_size_t_to_int_warning", | 101   "//build/config/compiler:no_size_t_to_int_warning", | 
| 102 ] | 102 ] | 
| 103 | 103 | 
| 104 if (use_glib && use_gconf && !is_chromeos) { | 104 if (use_glib && use_gconf && !is_chromeos) { | 
| 105   net_configs += [ "//build/config/linux:gconf" ] | 105   net_configs += [ "//build/config/linux/gconf" ] | 
| 106 } | 106 } | 
| 107 | 107 | 
| 108 if (is_linux) { | 108 if (is_linux) { | 
| 109   net_configs += [ "//build/config/linux:libresolv" ] | 109   net_configs += [ "//build/config/linux:libresolv" ] | 
| 110 } | 110 } | 
| 111 | 111 | 
| 112 component("net") { | 112 component("net") { | 
| 113   sources = gypi_values.net_nacl_common_sources | 113   sources = gypi_values.net_nacl_common_sources | 
| 114   net_unfiltered_sources = [] | 114   net_unfiltered_sources = [] | 
| 115 | 115 | 
| (...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 930       ] | 930       ] | 
| 931       deps = [ | 931       deps = [ | 
| 932         ":net", | 932         ":net", | 
| 933         ":net_with_v8", | 933         ":net_with_v8", | 
| 934         "//base", | 934         "//base", | 
| 935         "//build/config/sanitizers:deps", | 935         "//build/config/sanitizers:deps", | 
| 936       ] | 936       ] | 
| 937 | 937 | 
| 938       if (is_desktop_linux && use_gconf && use_glib) { | 938       if (is_desktop_linux && use_gconf && use_glib) { | 
| 939         configs += [ | 939         configs += [ | 
| 940           "//build/config/linux:gconf", | 940           "//build/config/linux/gconf", | 
| 941           "//build/config/linux:glib", | 941           "//build/config/linux:glib", | 
| 942         ] | 942         ] | 
| 943         deps += [ "//build/linux:gio" ] | 943         deps += [ "//build/linux:gio" ] | 
| 944       } | 944       } | 
| 945     } | 945     } | 
| 946   } | 946   } | 
| 947 | 947 | 
| 948   executable("run_testserver") { | 948   executable("run_testserver") { | 
| 949     testonly = true | 949     testonly = true | 
| 950     sources = [ | 950     sources = [ | 
| (...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1897   sources = [ | 1897   sources = [ | 
| 1898     "socket/socks5_client_socket_fuzzer.cc", | 1898     "socket/socks5_client_socket_fuzzer.cc", | 
| 1899   ] | 1899   ] | 
| 1900   deps = [ | 1900   deps = [ | 
| 1901     ":net_fuzzer_test_support", | 1901     ":net_fuzzer_test_support", | 
| 1902     ":test_support", | 1902     ":test_support", | 
| 1903     "//base", | 1903     "//base", | 
| 1904     "//net", | 1904     "//net", | 
| 1905   ] | 1905   ] | 
| 1906 } | 1906 } | 
| OLD | NEW | 
|---|