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

Side by Side Diff: dart/runtime/bin/net/nss.gyp

Issue 201853003: Update NSS to NSS 3.16 RTM (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 6 years, 9 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
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 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 5 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
6 # for details. All rights reserved. Use of this source code is governed by a 6 # for details. All rights reserved. Use of this source code is governed by a
7 # BSD-style license that can be found in the LICENSE file. 7 # BSD-style license that can be found in the LICENSE file.
8 8
9 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp. 9 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp.
10 # Revision 232552 (this should agree with "nss_rev" in DEPS). 10 # Revision 257452 (this should agree with "nss_rev" in DEPS).
11 { 11 {
12 # Added by Dart. All Dart comments refer to the following block or line. 12 # Added by Dart. All Dart comments refer to the following block or line.
13 'includes': [ 13 'includes': [
14 '../../tools/gyp/runtime-configurations.gypi', 14 '../../tools/gyp/runtime-configurations.gypi',
15 '../../tools/gyp/nss_configurations.gypi', 15 '../../tools/gyp/nss_configurations.gypi',
16 ], 16 ],
17 'variables': { 17 'variables': {
18 # Added by Dart. 18 # Added by Dart.
19 'nss_directory': '../../../third_party/nss', 19 'nss_directory': '../../../third_party/nss',
20 'conditions': [ 20 'conditions': [
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 '<(nss_directory)/nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-increm ental-source.c', 725 '<(nss_directory)/nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-increm ental-source.c',
726 '<(nss_directory)/nss/lib/freebl/poly1305/poly1305.c', 726 '<(nss_directory)/nss/lib/freebl/poly1305/poly1305.c',
727 '<(nss_directory)/nss/lib/freebl/poly1305/poly1305.h', 727 '<(nss_directory)/nss/lib/freebl/poly1305/poly1305.h',
728 '<(nss_directory)/nss/lib/freebl/pqg.c', 728 '<(nss_directory)/nss/lib/freebl/pqg.c',
729 '<(nss_directory)/nss/lib/freebl/pqg.h', 729 '<(nss_directory)/nss/lib/freebl/pqg.h',
730 '<(nss_directory)/nss/lib/freebl/rawhash.c', 730 '<(nss_directory)/nss/lib/freebl/rawhash.c',
731 '<(nss_directory)/nss/lib/freebl/rijndael.c', 731 '<(nss_directory)/nss/lib/freebl/rijndael.c',
732 '<(nss_directory)/nss/lib/freebl/rijndael.h', 732 '<(nss_directory)/nss/lib/freebl/rijndael.h',
733 '<(nss_directory)/nss/lib/freebl/rijndael32.tab', 733 '<(nss_directory)/nss/lib/freebl/rijndael32.tab',
734 '<(nss_directory)/nss/lib/freebl/rsa.c', 734 '<(nss_directory)/nss/lib/freebl/rsa.c',
735 '<(nss_directory)/nss/lib/freebl/rsapkcs.c',
735 '<(nss_directory)/nss/lib/freebl/secmpi.h', 736 '<(nss_directory)/nss/lib/freebl/secmpi.h',
736 '<(nss_directory)/nss/lib/freebl/secrng.h', 737 '<(nss_directory)/nss/lib/freebl/secrng.h',
737 '<(nss_directory)/nss/lib/freebl/seed.c', 738 '<(nss_directory)/nss/lib/freebl/seed.c',
738 '<(nss_directory)/nss/lib/freebl/seed.h', 739 '<(nss_directory)/nss/lib/freebl/seed.h',
739 '<(nss_directory)/nss/lib/freebl/sha256.h', 740 '<(nss_directory)/nss/lib/freebl/sha256.h',
740 '<(nss_directory)/nss/lib/freebl/sha512.c', 741 '<(nss_directory)/nss/lib/freebl/sha512.c',
741 '<(nss_directory)/nss/lib/freebl/sha_fast.c', 742 '<(nss_directory)/nss/lib/freebl/sha_fast.c',
742 '<(nss_directory)/nss/lib/freebl/sha_fast.h', 743 '<(nss_directory)/nss/lib/freebl/sha_fast.h',
743 '<(nss_directory)/nss/lib/freebl/shsign.h', 744 '<(nss_directory)/nss/lib/freebl/shsign.h',
744 '<(nss_directory)/nss/lib/freebl/shvfy.c', 745 '<(nss_directory)/nss/lib/freebl/shvfy.c',
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 '<(nss_directory)/nss/lib/softoken/lowkeyi.h', 995 '<(nss_directory)/nss/lib/softoken/lowkeyi.h',
995 '<(nss_directory)/nss/lib/softoken/lowkeyti.h', 996 '<(nss_directory)/nss/lib/softoken/lowkeyti.h',
996 '<(nss_directory)/nss/lib/softoken/lowpbe.c', 997 '<(nss_directory)/nss/lib/softoken/lowpbe.c',
997 '<(nss_directory)/nss/lib/softoken/lowpbe.h', 998 '<(nss_directory)/nss/lib/softoken/lowpbe.h',
998 '<(nss_directory)/nss/lib/softoken/padbuf.c', 999 '<(nss_directory)/nss/lib/softoken/padbuf.c',
999 '<(nss_directory)/nss/lib/softoken/pkcs11.c', 1000 '<(nss_directory)/nss/lib/softoken/pkcs11.c',
1000 '<(nss_directory)/nss/lib/softoken/pkcs11c.c', 1001 '<(nss_directory)/nss/lib/softoken/pkcs11c.c',
1001 '<(nss_directory)/nss/lib/softoken/pkcs11i.h', 1002 '<(nss_directory)/nss/lib/softoken/pkcs11i.h',
1002 '<(nss_directory)/nss/lib/softoken/pkcs11ni.h', 1003 '<(nss_directory)/nss/lib/softoken/pkcs11ni.h',
1003 '<(nss_directory)/nss/lib/softoken/pkcs11u.c', 1004 '<(nss_directory)/nss/lib/softoken/pkcs11u.c',
1004 '<(nss_directory)/nss/lib/softoken/rsawrapr.c',
1005 '<(nss_directory)/nss/lib/softoken/sdb.c', 1005 '<(nss_directory)/nss/lib/softoken/sdb.c',
1006 '<(nss_directory)/nss/lib/softoken/sdb.h', 1006 '<(nss_directory)/nss/lib/softoken/sdb.h',
1007 '<(nss_directory)/nss/lib/softoken/sftkdb.c', 1007 '<(nss_directory)/nss/lib/softoken/sftkdb.c',
1008 '<(nss_directory)/nss/lib/softoken/sftkdb.h', 1008 '<(nss_directory)/nss/lib/softoken/sftkdb.h',
1009 '<(nss_directory)/nss/lib/softoken/sftkdbt.h', 1009 '<(nss_directory)/nss/lib/softoken/sftkdbt.h',
1010 '<(nss_directory)/nss/lib/softoken/sftkdbti.h', 1010 '<(nss_directory)/nss/lib/softoken/sftkdbti.h',
1011 '<(nss_directory)/nss/lib/softoken/sftkhmac.c', 1011 '<(nss_directory)/nss/lib/softoken/sftkhmac.c',
1012 '<(nss_directory)/nss/lib/softoken/sftkpars.c', 1012 '<(nss_directory)/nss/lib/softoken/sftkpars.c',
1013 '<(nss_directory)/nss/lib/softoken/sftkpars.h', 1013 '<(nss_directory)/nss/lib/softoken/sftkpars.h',
1014 '<(nss_directory)/nss/lib/softoken/sftkpwd.c', 1014 '<(nss_directory)/nss/lib/softoken/sftkpwd.c',
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 'dependencies': [ 1095 'dependencies': [
1096 'nspr_dart', # Added by Dart (the _dart postfix) 1096 'nspr_dart', # Added by Dart (the _dart postfix)
1097 'sqlite.gyp:sqlite_dart', # Changed by Dart prefix ../sqllite removed _ dart postfix added. 1097 'sqlite.gyp:sqlite_dart', # Changed by Dart prefix ../sqllite removed _ dart postfix added.
1098 ], 1098 ],
1099 'export_dependent_settings': [ 1099 'export_dependent_settings': [
1100 'nspr_dart', # Added by Dart (the _dart postfix) 1100 'nspr_dart', # Added by Dart (the _dart postfix)
1101 ], 1101 ],
1102 'defines': [ 1102 'defines': [
1103 'MP_API_COMPATIBLE', 1103 'MP_API_COMPATIBLE',
1104 'NSS_DISABLE_DBM', 1104 'NSS_DISABLE_DBM',
1105 'NSS_ENABLE_ECC',
1106 'NSS_STATIC', 1105 'NSS_STATIC',
1107 'NSS_USE_STATIC_LIBS', 1106 'NSS_USE_STATIC_LIBS',
1108 'RIJNDAEL_INCLUDE_TABLES', 1107 'RIJNDAEL_INCLUDE_TABLES',
1109 'SHLIB_VERSION=\"3\"', 1108 'SHLIB_VERSION=\"3\"',
1110 'SOFTOKEN_SHLIB_VERSION=\"3\"', 1109 'SOFTOKEN_SHLIB_VERSION=\"3\"',
1111 'USE_UTIL_DIRECTLY', 1110 'USE_UTIL_DIRECTLY',
1112 ], 1111 ],
1113 'include_dirs': [ 1112 'include_dirs': [
1114 '<(nss_directory)/nss/lib/base', 1113 '<(nss_directory)/nss/lib/base',
1115 '<(nss_directory)/nss/lib/certdb', 1114 '<(nss_directory)/nss/lib/certdb',
(...skipping 19 matching lines...) Expand all
1135 '<(nss_directory)/nss/lib/pk11wrap', 1134 '<(nss_directory)/nss/lib/pk11wrap',
1136 '<(nss_directory)/nss/lib/pkcs7', 1135 '<(nss_directory)/nss/lib/pkcs7',
1137 '<(nss_directory)/nss/lib/pki', 1136 '<(nss_directory)/nss/lib/pki',
1138 '<(nss_directory)/nss/lib/smime', 1137 '<(nss_directory)/nss/lib/smime',
1139 '<(nss_directory)/nss/lib/softoken', 1138 '<(nss_directory)/nss/lib/softoken',
1140 '<(nss_directory)/nss/lib/ssl', 1139 '<(nss_directory)/nss/lib/ssl',
1141 '<(nss_directory)/nss/lib/util', 1140 '<(nss_directory)/nss/lib/util',
1142 ], 1141 ],
1143 'direct_dependent_settings': { 1142 'direct_dependent_settings': {
1144 'defines': [ 1143 'defines': [
1145 'NSS_ENABLE_ECC',
1146 'NSS_STATIC', 1144 'NSS_STATIC',
1147 'NSS_USE_STATIC_LIBS', 1145 'NSS_USE_STATIC_LIBS',
1148 'USE_UTIL_DIRECTLY', 1146 'USE_UTIL_DIRECTLY',
1149 ], 1147 ],
1150 'include_dirs': [ 1148 'include_dirs': [
1151 '<(nss_directory)/nspr/pr/include', 1149 '<(nss_directory)/nspr/pr/include',
1152 '<(nss_directory)/nspr/lib/ds', 1150 '<(nss_directory)/nspr/lib/ds',
1153 '<(nss_directory)/nspr/lib/libc/include', 1151 '<(nss_directory)/nspr/lib/libc/include',
1154 '<(nss_directory)/nss/lib/base', 1152 '<(nss_directory)/nss/lib/base',
1155 '<(nss_directory)/nss/lib/certdb', 1153 '<(nss_directory)/nss/lib/certdb',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1187 'sources!': [ 1185 'sources!': [
1188 '<(nss_directory)/nss/lib/certhigh/certvfypkix.c', 1186 '<(nss_directory)/nss/lib/certhigh/certvfypkix.c',
1189 '<(nss_directory)/nss/lib/certhigh/certvfypkixprint.c', 1187 '<(nss_directory)/nss/lib/certhigh/certvfypkixprint.c',
1190 ], 1188 ],
1191 # Changed by Dart: 1189 # Changed by Dart:
1192 # nss_directory contains .., which is bad in a regular expression. 1190 # nss_directory contains .., which is bad in a regular expression.
1193 # So we use the partial match by dropping '^' from '^nss/... 1191 # So we use the partial match by dropping '^' from '^nss/...
1194 'include_dirs/': [ 1192 'include_dirs/': [
1195 ['exclude', 'nss/lib/libpkix/'], 1193 ['exclude', 'nss/lib/libpkix/'],
1196 ], 1194 ],
1195 }, { # else: exclude_nss_libpkix==0
1196 # Disable the LDAP code in libpkix.
1197 'defines': [
1198 'NSS_PKIX_NO_LDAP',
1199 ],
1200 'sources!': [
1201 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcer tstore.c',
1202 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapcer tstore.h',
1203 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdef aultclient.c',
1204 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapdef aultclient.h',
1205 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapreq uest.c',
1206 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapreq uest.h',
1207 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapres ponse.c',
1208 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapres ponse.h',
1209 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldapt.h ',
1210 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_ldaptem plates.c',
1211 ],
1197 }], 1212 }],
1198 ['target_arch=="ia32"', { 1213 ['target_arch=="ia32"', {
1199 'sources!': [ 1214 'sources!': [
1200 '<(nss_directory)/nss/lib/freebl/mpi/mpi_amd64.c', 1215 '<(nss_directory)/nss/lib/freebl/mpi/mpi_amd64.c',
1201 ], 1216 ],
1202 }], 1217 }],
1203 # Added by Dart. 1218 # Added by Dart.
1204 ['OS=="linux"', { 1219 ['OS=="linux"', {
1205 'defines': [ 1220 'defines': [
1206 'XP_UNIX', 1221 'XP_UNIX',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1335 '-Wno-logical-op-parentheses', 1350 '-Wno-logical-op-parentheses',
1336 '-Wno-switch', 1351 '-Wno-switch',
1337 '-Wno-tautological-compare', 1352 '-Wno-tautological-compare',
1338 ], 1353 ],
1339 }], 1354 }],
1340 ], 1355 ],
1341 }, 1356 },
1342 ], 1357 ],
1343 }]], 1358 }]],
1344 } 1359 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698