Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(843)

Side by Side Diff: build/secondary/third_party/nss/BUILD.gn

Issue 929793006: Update existing uses of /wd4267 to use the GN config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@x64
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/secondary/third_party/cacheinvalidation/BUILD.gn ('k') | cc/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 public_configs = [ ":nspr_config" ] 211 public_configs = [ ":nspr_config" ]
212 212
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 += [ "//build/config/compiler:no_chromium_code" ] 220 configs += [
221 "//build/config/compiler:no_chromium_code",
222 "//build/config/compiler:no_size_t_to_int_warning",
223 ]
221 224
222 cflags = [] 225 cflags = []
223 defines = [ 226 defines = [
224 "_NSPR_BUILD_", 227 "_NSPR_BUILD_",
225 "FORCE_PR_LOG", 228 "FORCE_PR_LOG",
226 ] 229 ]
227 230
228 include_dirs = [ "nspr/pr/include/private" ] 231 include_dirs = [ "nspr/pr/include/private" ]
229 232
230 if (is_win) { 233 if (is_win) {
231 cflags = [ 234 cflags = [
232 "/wd4554", # Check precidence. 235 "/wd4554", # Check precidence.
233 "/wd4267", # Conversion from size_t to "type".
234 ] 236 ]
235 defines += [ 237 defines += [
236 "XP_PC", 238 "XP_PC",
237 "WIN32", 239 "WIN32",
238 "WIN95", 240 "WIN95",
239 "_PR_GLOBAL_THREADS_ONLY", 241 "_PR_GLOBAL_THREADS_ONLY",
240 "_CRT_SECURE_NO_WARNINGS", 242 "_CRT_SECURE_NO_WARNINGS",
241 ] 243 ]
242 } else { 244 } else {
243 sources -= [ 245 sources -= [
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 "nss/lib/freebl/win_rand.c", 877 "nss/lib/freebl/win_rand.c",
876 878
877 # debug_module.c is included by pk11load.c. 879 # debug_module.c is included by pk11load.c.
878 "nss/lib/pk11wrap/debug_module.c", 880 "nss/lib/pk11wrap/debug_module.c",
879 ] 881 ]
880 882
881 configs -= [ "//build/config/compiler:chromium_code" ] 883 configs -= [ "//build/config/compiler:chromium_code" ]
882 if (is_win) { 884 if (is_win) {
883 configs -= [ "//build/config/win:unicode" ] # Requires 8-bit mode. 885 configs -= [ "//build/config/win:unicode" ] # Requires 8-bit mode.
884 } 886 }
885 configs += [ "//build/config/compiler:no_chromium_code" ] 887 configs += [
888 "//build/config/compiler:no_chromium_code",
889 "//build/config/compiler:no_size_t_to_int_warning",
890 ]
886 public_configs = [ ":nss_static_config" ] 891 public_configs = [ ":nss_static_config" ]
887 892
888 cflags = [] 893 cflags = []
889 894
890 # Only need the defines and includes not in nss_static_config. 895 # Only need the defines and includes not in nss_static_config.
891 defines = [ 896 defines = [
892 "MP_API_COMPATIBLE", 897 "MP_API_COMPATIBLE",
893 "NSS_DISABLE_DBM", 898 "NSS_DISABLE_DBM",
894 "RIJNDAEL_INCLUDE_TABLES", 899 "RIJNDAEL_INCLUDE_TABLES",
895 "SHLIB_VERSION=\"3\"", 900 "SHLIB_VERSION=\"3\"",
896 "SOFTOKEN_SHLIB_VERSION=\"3\"", 901 "SOFTOKEN_SHLIB_VERSION=\"3\"",
897 ] 902 ]
898 include_dirs = [ 903 include_dirs = [
899 "nss/lib/freebl/mpi", 904 "nss/lib/freebl/mpi",
900 "nss/lib/ssl", 905 "nss/lib/ssl",
901 ] 906 ]
902 907
903 if (is_win) { 908 if (is_win) {
904 cflags += [ 909 cflags += [
905 "/wd4101", # Unreferenced local variable. 910 "/wd4101", # Unreferenced local variable.
906 "/wd4267", # Conversion from size_t to "type".
907 ] 911 ]
908 } 912 }
909 913
910 if (include_nss_libpkix) { 914 if (include_nss_libpkix) {
911 sources += [ 915 sources += [
912 "nss/lib/certhigh/certvfypkix.c", 916 "nss/lib/certhigh/certvfypkix.c",
913 "nss/lib/certhigh/certvfypkixprint.c", 917 "nss/lib/certhigh/certvfypkixprint.c",
914 "nss/lib/libpkix/include/pkix.h", 918 "nss/lib/libpkix/include/pkix.h",
915 "nss/lib/libpkix/include/pkix_certsel.h", 919 "nss/lib/libpkix/include/pkix_certsel.h",
916 "nss/lib/libpkix/include/pkix_certstore.h", 920 "nss/lib/libpkix/include/pkix_certstore.h",
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 deps = [ 1206 deps = [
1203 ":nspr", 1207 ":nspr",
1204 "//third_party/sqlite", 1208 "//third_party/sqlite",
1205 ] 1209 ]
1206 1210
1207 if (is_win && cpu_arch == "x86") { 1211 if (is_win && cpu_arch == "x86") {
1208 deps += [ ":nss_static_avx" ] 1212 deps += [ ":nss_static_avx" ]
1209 } 1213 }
1210 } 1214 }
1211 } # Windows/Mac/iOS. 1215 } # Windows/Mac/iOS.
OLDNEW
« no previous file with comments | « build/secondary/third_party/cacheinvalidation/BUILD.gn ('k') | cc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698