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

Side by Side Diff: net/BUILD.gn

Issue 1398473005: be more explicit about gconf and glib conditions in net/BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/config/chromecast_build.gni") 5 import("//build/config/chromecast_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//build/module_args/v8.gni") 10 import("//build/module_args/v8.gni")
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 # Android doesn't use these even when using OpenSSL. 233 # Android doesn't use these even when using OpenSSL.
234 net_shared_sources -= [ 234 net_shared_sources -= [
235 "base/openssl_private_key_store_memory.cc", 235 "base/openssl_private_key_store_memory.cc",
236 "cert/cert_database_openssl.cc", 236 "cert/cert_database_openssl.cc",
237 "cert/cert_verify_proc_openssl.cc", 237 "cert/cert_verify_proc_openssl.cc",
238 "cert/test_root_certs_openssl.cc", 238 "cert/test_root_certs_openssl.cc",
239 ] 239 ]
240 } 240 }
241 } 241 }
242 242
243 if (use_glib && !is_chromeos) { 243 if (use_glib && use_gconf && !is_chromeos) {
244 net_shared_configs += [ "//build/config/linux:gconf" ] 244 net_shared_configs += [ "//build/config/linux:gconf" ]
245 net_shared_deps += [ "//build/linux:gio" ] 245 net_shared_deps += [ "//build/linux:gio" ]
246 } 246 }
247 247
248 if (is_linux) { 248 if (is_linux) {
249 net_shared_configs += [ "//build/config/linux:libresolv" ] 249 net_shared_configs += [ "//build/config/linux:libresolv" ]
250 } 250 }
251 251
252 if (!use_nss_certs) { 252 if (!use_nss_certs) {
253 net_shared_sources -= [ 253 net_shared_sources -= [
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 sources = [ 952 sources = [
953 "tools/net_watcher/net_watcher.cc", 953 "tools/net_watcher/net_watcher.cc",
954 ] 954 ]
955 deps = [ 955 deps = [
956 ":net", 956 ":net",
957 ":net_with_v8", 957 ":net_with_v8",
958 "//base", 958 "//base",
959 "//build/config/sanitizers:deps", 959 "//build/config/sanitizers:deps",
960 ] 960 ]
961 961
962 if (is_desktop_linux && use_gconf) { 962 if (is_desktop_linux && use_gconf && use_glib) {
963 configs += [ 963 configs += [
964 "//build/config/linux:gconf", 964 "//build/config/linux:gconf",
965 "//build/config/linux:glib", 965 "//build/config/linux:glib",
966 ] 966 ]
967 deps += [ "//build/linux:gio" ] 967 deps += [ "//build/linux:gio" ]
968 } 968 }
969 } 969 }
970 } 970 }
971 971
972 executable("run_testserver") { 972 executable("run_testserver") {
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
1638 if (enable_websockets) { 1638 if (enable_websockets) {
1639 sources += [ "websockets/websocket_frame_perftest.cc" ] 1639 sources += [ "websockets/websocket_frame_perftest.cc" ]
1640 } 1640 }
1641 1641
1642 if (use_v8_in_net) { 1642 if (use_v8_in_net) {
1643 deps += [ ":net_with_v8" ] 1643 deps += [ ":net_with_v8" ]
1644 } else { 1644 } else {
1645 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1645 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1646 } 1646 }
1647 } 1647 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698