| 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 configs -= [ "//build/config/compiler:chromium_code" ] | 213 configs -= [ "//build/config/compiler:chromium_code" ] |
| 214 if (is_win) { | 214 if (is_win) { |
| 215 configs -= [ | 215 configs -= [ |
| 216 "//build/config/win:unicode", # Requires 8-bit mode. | 216 "//build/config/win:unicode", # Requires 8-bit mode. |
| 217 "//build/config/win:lean_and_mean", # Won"t compile with lean and mean. | 217 "//build/config/win:lean_and_mean", # Won"t compile with lean and mean. |
| 218 ] | 218 ] |
| 219 } | 219 } |
| 220 configs += [ | 220 configs += [ |
| 221 "//build/config/compiler:no_chromium_code", | 221 "//build/config/compiler:no_chromium_code", |
| 222 "//build/config/compiler:no_size_t_to_int_warning", | 222 "//build/config/compiler:no_size_t_to_int_warning", |
| 223 |
| 224 # nspr passes "const char*" through "void*". |
| 225 "//build/compiler:no_incompatible_pointer_warnings", |
| 223 ] | 226 ] |
| 224 | 227 |
| 225 cflags = [] | 228 cflags = [] |
| 226 defines = [ | 229 defines = [ |
| 227 "_NSPR_BUILD_", | 230 "_NSPR_BUILD_", |
| 228 "FORCE_PR_LOG", | 231 "FORCE_PR_LOG", |
| 229 ] | 232 ] |
| 230 | 233 |
| 231 include_dirs = [ "nspr/pr/include/private" ] | 234 include_dirs = [ "nspr/pr/include/private" ] |
| 232 | 235 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 "CoreServices.framework", | 322 "CoreServices.framework", |
| 320 ] | 323 ] |
| 321 } | 324 } |
| 322 | 325 |
| 323 if (is_clang) { | 326 if (is_clang) { |
| 324 cflags += [ | 327 cflags += [ |
| 325 # nspr uses a bunch of deprecated functions (NSLinkModule etc) in | 328 # nspr uses a bunch of deprecated functions (NSLinkModule etc) in |
| 326 # prlink.c on mac. | 329 # prlink.c on mac. |
| 327 "-Wno-deprecated-declarations", | 330 "-Wno-deprecated-declarations", |
| 328 | 331 |
| 329 # nspr passes "const char*" through "void*". | |
| 330 "-Wno-incompatible-pointer-types", | |
| 331 | |
| 332 # nspr passes "int*" through "unsigned int*". | 332 # nspr passes "int*" through "unsigned int*". |
| 333 "-Wno-pointer-sign", | 333 "-Wno-pointer-sign", |
| 334 ] | 334 ] |
| 335 | 335 |
| 336 # nspr uses assert(!"foo") instead of assert(false && "foo"). | 336 # nspr uses assert(!"foo") instead of assert(false && "foo"). |
| 337 configs -= [ "//build/config/clang:extra_warnings" ] | 337 configs -= [ "//build/config/clang:extra_warnings" ] |
| 338 } | 338 } |
| 339 } | 339 } |
| 340 | 340 |
| 341 component("nss") { | 341 component("nss") { |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 878 "nss/lib/pk11wrap/debug_module.c", | 878 "nss/lib/pk11wrap/debug_module.c", |
| 879 ] | 879 ] |
| 880 | 880 |
| 881 configs -= [ "//build/config/compiler:chromium_code" ] | 881 configs -= [ "//build/config/compiler:chromium_code" ] |
| 882 if (is_win) { | 882 if (is_win) { |
| 883 configs -= [ "//build/config/win:unicode" ] # Requires 8-bit mode. | 883 configs -= [ "//build/config/win:unicode" ] # Requires 8-bit mode. |
| 884 } | 884 } |
| 885 configs += [ | 885 configs += [ |
| 886 "//build/config/compiler:no_chromium_code", | 886 "//build/config/compiler:no_chromium_code", |
| 887 "//build/config/compiler:no_size_t_to_int_warning", | 887 "//build/config/compiler:no_size_t_to_int_warning", |
| 888 |
| 889 # nss passes "const char*" through "void*". |
| 890 "//build/compiler:no_incompatible_pointer_warnings", |
| 888 ] | 891 ] |
| 889 public_configs = [ ":nss_static_config" ] | 892 public_configs = [ ":nss_static_config" ] |
| 890 | 893 |
| 891 cflags = [] | 894 cflags = [] |
| 892 | 895 |
| 893 # Only need the defines and includes not in nss_static_config. | 896 # Only need the defines and includes not in nss_static_config. |
| 894 defines = [ | 897 defines = [ |
| 895 "MP_API_COMPATIBLE", | 898 "MP_API_COMPATIBLE", |
| 896 "NSS_DISABLE_DBM", | 899 "NSS_DISABLE_DBM", |
| 897 "RIJNDAEL_INCLUDE_TABLES", | 900 "RIJNDAEL_INCLUDE_TABLES", |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1175 # mpi_x86_asm.c contains MSVC inline assembly code. | 1178 # mpi_x86_asm.c contains MSVC inline assembly code. |
| 1176 "nss/lib/freebl/mpi/mpi_x86_asm.c", | 1179 "nss/lib/freebl/mpi/mpi_x86_asm.c", |
| 1177 ] | 1180 ] |
| 1178 } | 1181 } |
| 1179 | 1182 |
| 1180 if (is_clang) { | 1183 if (is_clang) { |
| 1181 cflags += [ | 1184 cflags += [ |
| 1182 # nss doesn"t explicitly cast between different enum types. | 1185 # nss doesn"t explicitly cast between different enum types. |
| 1183 "-Wno-conversion", | 1186 "-Wno-conversion", |
| 1184 | 1187 |
| 1185 # nss passes "const char*" through "void*". | |
| 1186 "-Wno-incompatible-pointer-types", | |
| 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", |
| 1190 | 1190 |
| 1191 # nss doesn"t use exhaustive switches on enums | 1191 # nss doesn"t use exhaustive switches on enums |
| 1192 "-Wno-switch", | 1192 "-Wno-switch", |
| 1193 | 1193 |
| 1194 # nss has some `unsigned < 0` checks. | 1194 # nss has some `unsigned < 0` checks. |
| 1195 "-Wno-tautological-compare", | 1195 "-Wno-tautological-compare", |
| 1196 ] | 1196 ] |
| 1197 } | 1197 } |
| 1198 | 1198 |
| 1199 public_deps = [ | 1199 public_deps = [ |
| 1200 ":nspr", | 1200 ":nspr", |
| 1201 ] | 1201 ] |
| 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 |