Chromium Code Reviews| 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("//url/config.gni") | 8 import("//url/config.gni") |
| 9 | 9 |
| 10 # 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. |
| (...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1185 } | 1185 } |
| 1186 } | 1186 } |
| 1187 | 1187 |
| 1188 if (use_openssl) { | 1188 if (use_openssl) { |
| 1189 # When building for OpenSSL, we need to exclude NSS specific tests | 1189 # When building for OpenSSL, we need to exclude NSS specific tests |
| 1190 # or functionality not supported by OpenSSL yet. | 1190 # or functionality not supported by OpenSSL yet. |
| 1191 # TODO(bulach): Add equivalent tests when the underlying | 1191 # TODO(bulach): Add equivalent tests when the underlying |
| 1192 # functionality is ported to OpenSSL. | 1192 # functionality is ported to OpenSSL. |
| 1193 sources -= [ | 1193 sources -= [ |
| 1194 "cert/nss_cert_database_unittest.cc", | 1194 "cert/nss_cert_database_unittest.cc", |
| 1195 "cert/nss_cert_database_chromeos_unittest.cc", | |
| 1196 "cert/nss_profile_filter_chromeos_unittest.cc", | |
| 1197 "cert/x509_util_nss_unittest.cc", | 1195 "cert/x509_util_nss_unittest.cc", |
| 1198 "quic/test_tools/crypto_test_utils_nss.cc", | 1196 "quic/test_tools/crypto_test_utils_nss.cc", |
| 1199 ] | 1197 ] |
| 1198 if (is_chromeos) { | |
| 1199 # These were already removed in the ChromeOS case. | |
|
viettrungluu
2014/09/17 23:03:31
Did you mean "These were already removed in the no
brettw
2014/09/18 20:22:16
Done.
| |
| 1200 sources -= [ | |
| 1201 "cert/nss_cert_database_chromeos_unittest.cc", | |
| 1202 "cert/nss_profile_filter_chromeos_unittest.cc", | |
| 1203 ] | |
| 1204 } | |
| 1200 } else { | 1205 } else { |
| 1201 sources -= [ | 1206 sources -= [ |
| 1202 "cert/x509_util_openssl_unittest.cc", | 1207 "cert/x509_util_openssl_unittest.cc", |
| 1203 "quic/test_tools/crypto_test_utils_openssl.cc", | 1208 "quic/test_tools/crypto_test_utils_openssl.cc", |
| 1204 "socket/ssl_client_socket_openssl_unittest.cc", | 1209 "socket/ssl_client_socket_openssl_unittest.cc", |
| 1205 "socket/ssl_session_cache_openssl_unittest.cc", | 1210 "socket/ssl_session_cache_openssl_unittest.cc", |
| 1206 ] | 1211 ] |
| 1207 if (!is_desktop_linux && !is_chromeos) { | 1212 if (!is_desktop_linux && !is_chromeos) { |
| 1208 sources -= [ "cert/nss_cert_database_unittest.cc" ] | 1213 sources -= [ "cert/nss_cert_database_unittest.cc" ] |
| 1209 } | 1214 } |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1385 sources = [ "quic/quic_server_bin.cc" ] | 1390 sources = [ "quic/quic_server_bin.cc" ] |
| 1386 deps = [ | 1391 deps = [ |
| 1387 ":quic_tools", | 1392 ":quic_tools", |
| 1388 ":net", | 1393 ":net", |
| 1389 "//base", | 1394 "//base", |
| 1390 "//third_party/boringssl", | 1395 "//third_party/boringssl", |
| 1391 ] | 1396 ] |
| 1392 } | 1397 } |
| 1393 | 1398 |
| 1394 } # !is_android | 1399 } # !is_android |
| OLD | NEW |