| 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 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 "_AMD64_", | 1168 "_AMD64_", |
| 1169 "MP_CHAR_STORE_SLOW", | 1169 "MP_CHAR_STORE_SLOW", |
| 1170 "MP_IS_LITTLE_ENDIAN", | 1170 "MP_IS_LITTLE_ENDIAN", |
| 1171 "WIN64", | 1171 "WIN64", |
| 1172 ] | 1172 ] |
| 1173 } | 1173 } |
| 1174 } else { | 1174 } else { |
| 1175 # Not Windows. | 1175 # Not Windows. |
| 1176 sources -= [ | 1176 sources -= [ |
| 1177 # mpi_x86_asm.c contains MSVC inline assembly code. | 1177 # mpi_x86_asm.c contains MSVC inline assembly code. |
| 1178 "nss/lib/freebl/intel-aes-x86-masm.asm", |
| 1178 "nss/lib/freebl/mpi/mpi_x86_asm.c", | 1179 "nss/lib/freebl/mpi/mpi_x86_asm.c", |
| 1179 "nss/lib/freebl/intel-aes-x86-masm.asm", | |
| 1180 ] | 1180 ] |
| 1181 } | 1181 } |
| 1182 | 1182 |
| 1183 if (is_clang) { | 1183 if (is_clang) { |
| 1184 cflags += [ | 1184 cflags += [ |
| 1185 # nss doesn"t explicitly cast between different enum types. | 1185 # nss doesn"t explicitly cast between different enum types. |
| 1186 "-Wno-conversion", | 1186 "-Wno-conversion", |
| 1187 | 1187 |
| 1188 # nss prefers `a && b || c` over `(a && b) || c`. | 1188 # nss prefers `a && b || c` over `(a && b) || c`. |
| 1189 "-Wno-logical-op-parentheses", | 1189 "-Wno-logical-op-parentheses", |
| (...skipping 12 matching lines...) Expand all Loading... |
| 1202 deps = [ | 1202 deps = [ |
| 1203 ":nspr", | 1203 ":nspr", |
| 1204 "//third_party/sqlite", | 1204 "//third_party/sqlite", |
| 1205 ] | 1205 ] |
| 1206 | 1206 |
| 1207 if (is_win && current_cpu == "x86") { | 1207 if (is_win && current_cpu == "x86") { |
| 1208 deps += [ ":nss_static_avx" ] | 1208 deps += [ ":nss_static_avx" ] |
| 1209 } | 1209 } |
| 1210 } | 1210 } |
| 1211 } # Windows/Mac/iOS. | 1211 } # Windows/Mac/iOS. |
| OLD | NEW |