 Chromium Code Reviews
 Chromium Code Reviews Issue 1553193002:
  Roll NSS by one revision  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1553193002:
  Roll NSS by one revision  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW | 
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/linux/pkg_config.gni") | 5 import("//build/config/linux/pkg_config.gni") | 
| 6 | 6 | 
| 7 if (is_linux) { | 7 if (is_linux) { | 
| 8 # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL | 8 # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL | 
| 9 # library but the system NSS libraries. Non-Linux platforms using NSS use the | 9 # library but the system NSS libraries. Non-Linux platforms using NSS use the | 
| 10 # hermetic one in //third_party/nss. | 10 # hermetic one in //third_party/nss. | 
| (...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1177 } else { | 1177 } else { | 
| 1178 # Not Windows. | 1178 # Not Windows. | 
| 1179 sources -= [ | 1179 sources -= [ | 
| 1180 # mpi_x86_asm.c contains MSVC inline assembly code. | 1180 # mpi_x86_asm.c contains MSVC inline assembly code. | 
| 1181 "nss/lib/freebl/intel-aes-x86-masm.asm", | 1181 "nss/lib/freebl/intel-aes-x86-masm.asm", | 
| 1182 "nss/lib/freebl/mpi/mpi_x86_asm.c", | 1182 "nss/lib/freebl/mpi/mpi_x86_asm.c", | 
| 1183 ] | 1183 ] | 
| 1184 } | 1184 } | 
| 1185 | 1185 | 
| 1186 if (is_clang) { | 1186 if (is_clang) { | 
| 1187 cflags += [ | 1187 cflags += [ | 
| 
Nico
2016/01/04 17:46:23
See RHS of https://codereview.chromium.org/1558903
 | |
| 1188 # nss doesn"t explicitly cast between different enum types. | 1188 # nss doesn"t explicitly cast between different enum types. | 
| 1189 "-Wno-conversion", | 1189 "-Wno-conversion", | 
| 1190 | 1190 | 
| 1191 # nss passes "const char*" through "void*". | |
| 1192 "-Wno-incompatible-pointer-types", | |
| 1193 | |
| 1191 # nss prefers `a && b || c` over `(a && b) || c`. | 1194 # nss prefers `a && b || c` over `(a && b) || c`. | 
| 1192 "-Wno-logical-op-parentheses", | 1195 "-Wno-logical-op-parentheses", | 
| 1193 | 1196 | 
| 1194 # nss doesn"t use exhaustive switches on enums | 1197 # nss doesn"t use exhaustive switches on enums | 
| 1195 "-Wno-switch", | 1198 "-Wno-switch", | 
| 1196 | 1199 | 
| 1197 # nss has some `unsigned < 0` checks. | 1200 # nss has some `unsigned < 0` checks. | 
| 1198 "-Wno-tautological-compare", | 1201 "-Wno-tautological-compare", | 
| 1202 | |
| 1203 # nss-urandom-abort.patch removed the only call to rng_systemFromNoise | |
| 1204 "-Wno-unused-function", | |
| 1199 ] | 1205 ] | 
| 1200 } | 1206 } | 
| 1201 | 1207 | 
| 1202 public_deps = [ | 1208 public_deps = [ | 
| 1203 ":nspr", | 1209 ":nspr", | 
| 1204 ] | 1210 ] | 
| 1205 deps = [ | 1211 deps = [ | 
| 1206 ":nspr", | 1212 ":nspr", | 
| 1207 "//third_party/sqlite", | 1213 "//third_party/sqlite", | 
| 1208 ] | 1214 ] | 
| 1209 | 1215 | 
| 1210 if (is_win && current_cpu == "x86") { | 1216 if (is_win && current_cpu == "x86") { | 
| 1211 deps += [ ":nss_static_avx" ] | 1217 deps += [ ":nss_static_avx" ] | 
| 1212 } | 1218 } | 
| 1213 } | 1219 } | 
| 1214 } # Windows/Mac/iOS. | 1220 } # Windows/Mac/iOS. | 
| OLD | NEW |