| 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/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//build/module_args/v8.gni") | |
| 9 import("//url/config.gni") | 8 import("//url/config.gni") |
| 10 | 9 |
| 11 # TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni. | 10 # TODO(cjhopman): //build/config/android/rules.gni also imports grit_rule.gni. |
| 12 # Currently, that file can't be imported multiple times. Make this always | 11 # Currently, that file can't be imported multiple times. Make this always |
| 13 # imported when http://crbug.com/393704 is fixed. | 12 # imported when http://crbug.com/393704 is fixed. |
| 14 if (!is_android) { | 13 if (!is_android) { |
| 15 import("//tools/grit/grit_rule.gni") | 14 import("//tools/grit/grit_rule.gni") |
| 16 } | 15 } |
| 17 | 16 |
| 18 if (is_android) { | 17 if (is_android) { |
| (...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1175 # No res_ninit() et al on Android, so this doesn't make a lot of | 1174 # No res_ninit() et al on Android, so this doesn't make a lot of |
| 1176 # sense. | 1175 # sense. |
| 1177 "dns/dns_config_service_posix_unittest.cc", | 1176 "dns/dns_config_service_posix_unittest.cc", |
| 1178 ] | 1177 ] |
| 1179 deps += [ | 1178 deps += [ |
| 1180 ":net_javatests", # FIXME(brettw) | 1179 ":net_javatests", # FIXME(brettw) |
| 1181 ":net_test_jni_headers", | 1180 ":net_test_jni_headers", |
| 1182 ] | 1181 ] |
| 1183 } | 1182 } |
| 1184 | 1183 |
| 1185 if (v8_use_external_startup_data) { | |
| 1186 deps += [ "//gin" ] | |
| 1187 } | |
| 1188 | |
| 1189 if (!use_nss_certs) { | 1184 if (!use_nss_certs) { |
| 1190 sources -= [ "ssl/client_cert_store_nss_unittest.cc" ] | 1185 sources -= [ "ssl/client_cert_store_nss_unittest.cc" ] |
| 1191 if (is_chromeos) { # Already removed for all non-ChromeOS builds. | 1186 if (is_chromeos) { # Already removed for all non-ChromeOS builds. |
| 1192 sources -= [ "ssl/client_cert_store_chromeos_unittest.cc" ] | 1187 sources -= [ "ssl/client_cert_store_chromeos_unittest.cc" ] |
| 1193 } | 1188 } |
| 1194 } | 1189 } |
| 1195 | 1190 |
| 1196 if (use_openssl) { | 1191 if (use_openssl) { |
| 1197 # When building for OpenSSL, we need to exclude NSS specific tests | 1192 # When building for OpenSSL, we need to exclude NSS specific tests |
| 1198 # or functionality not supported by OpenSSL yet. | 1193 # or functionality not supported by OpenSSL yet. |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1394 "quic/quic_server_bin.cc", | 1389 "quic/quic_server_bin.cc", |
| 1395 ] | 1390 ] |
| 1396 deps = [ | 1391 deps = [ |
| 1397 ":quic_tools", | 1392 ":quic_tools", |
| 1398 ":net", | 1393 ":net", |
| 1399 "//base", | 1394 "//base", |
| 1400 "//third_party/boringssl", | 1395 "//third_party/boringssl", |
| 1401 ] | 1396 ] |
| 1402 } | 1397 } |
| 1403 } # !is_android && !is_win && !is_mac | 1398 } # !is_android && !is_win && !is_mac |
| OLD | NEW |