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

Side by Side Diff: nss.gyp

Issue 11827039: Make all nss targets build on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['OS=="ios"', { 8 ['OS=="ios"', {
9 'exclude_nss_root_certs%': 0, 9 'exclude_nss_root_certs%': 0,
10 'exclude_nss_libpkix%': 0, 10 'exclude_nss_libpkix%': 0,
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 'mozilla/security/nss/lib/freebl/ecl', 1025 'mozilla/security/nss/lib/freebl/ecl',
1026 'mozilla/security/nss/lib/nss', 1026 'mozilla/security/nss/lib/nss',
1027 'mozilla/security/nss/lib/pk11wrap', 1027 'mozilla/security/nss/lib/pk11wrap',
1028 'mozilla/security/nss/lib/pkcs7', 1028 'mozilla/security/nss/lib/pkcs7',
1029 'mozilla/security/nss/lib/pki', 1029 'mozilla/security/nss/lib/pki',
1030 'mozilla/security/nss/lib/smime', 1030 'mozilla/security/nss/lib/smime',
1031 'mozilla/security/nss/lib/softoken', 1031 'mozilla/security/nss/lib/softoken',
1032 'mozilla/security/nss/lib/util', 1032 'mozilla/security/nss/lib/util',
1033 ], 1033 ],
1034 }, 1034 },
1035 'msvs_disabled_warnings': [4018, 4101], 1035 'msvs_disabled_warnings': [4018, 4101, 4267, ],
1036 'conditions': [ 1036 'conditions': [
1037 ['exclude_nss_root_certs==1', { 1037 ['exclude_nss_root_certs==1', {
1038 'defines': [ 1038 'defines': [
1039 'NSS_DISABLE_ROOT_CERTS', 1039 'NSS_DISABLE_ROOT_CERTS',
1040 ], 1040 ],
1041 }], 1041 }],
1042 ['exclude_nss_libpkix==1', { 1042 ['exclude_nss_libpkix==1', {
1043 'defines': [ 1043 'defines': [
1044 'NSS_DISABLE_LIBPKIX', 1044 'NSS_DISABLE_LIBPKIX',
1045 ], 1045 ],
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
1116 'NSS_X86_OR_X64', 1116 'NSS_X86_OR_X64',
1117 'NSS_X86', 1117 'NSS_X86',
1118 '_X86_', 1118 '_X86_',
1119 'MP_ASSEMBLY_MULTIPLY', 1119 'MP_ASSEMBLY_MULTIPLY',
1120 'MP_ASSEMBLY_SQUARE', 1120 'MP_ASSEMBLY_SQUARE',
1121 'MP_ASSEMBLY_DIV_2DX1D', 1121 'MP_ASSEMBLY_DIV_2DX1D',
1122 'MP_USE_UINT_DIGIT', 1122 'MP_USE_UINT_DIGIT',
1123 'MP_NO_MP_WORD', 1123 'MP_NO_MP_WORD',
1124 ], 1124 ],
1125 }], 1125 }],
1126 ['target_arch=="x64"', {
1127 'defines': [
1128 'NSS_USE_64',
1129 'NSS_X86_OR_X64',
1130 'NSS_X64',
1131 'WIN64',
1132 ],
1133 'sources!': [
1134 'mozilla/security/nss/lib/freebl/mpi/mpi_amd64.c',
1135 'mozilla/security/nss/lib/freebl/mpi/mpi_x86_asm.c',
1136 ],
1137 }],
1126 ], 1138 ],
1127 }], 1139 }],
1128 ['clang==1', { 1140 ['clang==1', {
1129 'xcode_settings': { 1141 'xcode_settings': {
1130 'WARNING_CFLAGS': [ 1142 'WARNING_CFLAGS': [
1131 # nss doesn't explicitly cast between different enum types. 1143 # nss doesn't explicitly cast between different enum types.
1132 '-Wno-conversion', 1144 '-Wno-conversion',
1133 # nss passes "const char*" through "void*". 1145 # nss passes "const char*" through "void*".
1134 '-Wno-incompatible-pointer-types', 1146 '-Wno-incompatible-pointer-types',
1135 # nss prefers `a && b || c` over `(a && b) || c`. 1147 # nss prefers `a && b || c` over `(a && b) || c`.
1136 '-Wno-logical-op-parentheses', 1148 '-Wno-logical-op-parentheses',
1137 # nss doesn't use exhaustive switches on enums 1149 # nss doesn't use exhaustive switches on enums
1138 '-Wno-switch', 1150 '-Wno-switch',
1139 # nss has some `unsigned < 0` checks. 1151 # nss has some `unsigned < 0` checks.
1140 '-Wno-tautological-compare', 1152 '-Wno-tautological-compare',
1141 ], 1153 ],
1142 }, 1154 },
1143 'cflags': [ 1155 'cflags': [
1144 '-Wno-conversion', 1156 '-Wno-conversion',
1145 '-Wno-incompatible-pointer-types', 1157 '-Wno-incompatible-pointer-types',
1146 '-Wno-logical-op-parentheses', 1158 '-Wno-logical-op-parentheses',
1147 '-Wno-switch', 1159 '-Wno-switch',
1148 '-Wno-tautological-compare', 1160 '-Wno-tautological-compare',
1149 ], 1161 ],
1150 }], 1162 }],
1151 ], 1163 ],
1152 }, 1164 },
1153 ], 1165 ],
1154 } 1166 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698