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

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

Issue 11413141: Roll NSS to 169195. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 years, 1 month 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 | « dart/runtime/bin/net/sqlite.gyp ('k') | dart/runtime/bin/net/zlib.gyp » ('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 (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 src/net/third_party/nss/ssl.gyp. 9 # This file is a modified copy of Chromium's src/net/third_party/nss/ssl.gyp.
10 # Revision 165464 (this should agree with "nss_rev" in DEPS). 10 # Revision 169195 (this should agree with "nss_rev" in DEPS).
11 { 11 {
12 # Conditions section for ssl-bodge (Compiling SSL on linux using system 12 # Conditions section for ssl-bodge (Compiling SSL on linux using system
13 # NSS and NSPR libraries) removed: 13 # NSS and NSPR libraries) removed:
14 # 'conditions': [ 14 # 'conditions': [
15 # [ 'os_posix == 1 and OS != "mac" and OS != "ios"', { 15 # [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
16 # ... 16 # ...
17 # }]], 17 # }]],
18 18
19 # Added by Dart. All Dart comments refer to the following block or line. 19 # Added by Dart. All Dart comments refer to the following block or line.
20 'includes': [ 20 'includes': [
21 '../../tools/gyp/runtime-configurations.gypi', 21 '../../tools/gyp/runtime-configurations.gypi',
22 '../../tools/gyp/nss_configurations.gypi', 22 '../../tools/gyp/nss_configurations.gypi',
23 ], 23 ],
24 # Added by Dart. 24 # Added by Dart.
25 'variables': { 25 'variables': {
26 'ssl_directory': '../../../third_party/net_nss', 26 'ssl_directory': '../../../third_party/net_nss',
27 'os_posix': 0, 27 'os_posix': 0,
28 }, 28 },
29 # Added by Dart. We do not indent, so diffs with the original are clearer. 29 # Added by Dart. We do not indent, so diffs with the original are clearer.
30 'conditions': [[ 'dart_io_support==1', { 30 'conditions': [[ 'dart_io_support==1', {
31 'targets': [ 31 'targets': [
32 { 32 {
33 'target_name': 'libssl_dart', 33 'target_name': 'libssl_dart', # Added by Dart (the _dart postfix)
34 'type': 'static_library', 34 'type': 'static_library',
35 # Changed by Dart: '<(ssl_directory)/' added to all paths. 35 # Changed by Dart: '<(ssl_directory)/' added to all paths.
36 'sources': [ 36 'sources': [
37 '<(ssl_directory)/ssl/authcert.c', 37 '<(ssl_directory)/ssl/authcert.c',
38 '<(ssl_directory)/ssl/cmpcert.c', 38 '<(ssl_directory)/ssl/cmpcert.c',
39 '<(ssl_directory)/ssl/derive.c', 39 '<(ssl_directory)/ssl/derive.c',
40 '<(ssl_directory)/ssl/dtls1con.c', 40 '<(ssl_directory)/ssl/dtlscon.c',
41 '<(ssl_directory)/ssl/nsskea.c',
42 '<(ssl_directory)/ssl/os2_err.c', 41 '<(ssl_directory)/ssl/os2_err.c',
43 '<(ssl_directory)/ssl/os2_err.h', 42 '<(ssl_directory)/ssl/os2_err.h',
44 '<(ssl_directory)/ssl/preenc.h', 43 '<(ssl_directory)/ssl/preenc.h',
45 '<(ssl_directory)/ssl/prelib.c', 44 '<(ssl_directory)/ssl/prelib.c',
46 '<(ssl_directory)/ssl/ssl.h', 45 '<(ssl_directory)/ssl/ssl.h',
47 '<(ssl_directory)/ssl/ssl3con.c', 46 '<(ssl_directory)/ssl/ssl3con.c',
48 '<(ssl_directory)/ssl/ssl3ecc.c', 47 '<(ssl_directory)/ssl/ssl3ecc.c',
49 '<(ssl_directory)/ssl/ssl3ext.c', 48 '<(ssl_directory)/ssl/ssl3ext.c',
50 '<(ssl_directory)/ssl/ssl3gthr.c', 49 '<(ssl_directory)/ssl/ssl3gthr.c',
51 '<(ssl_directory)/ssl/ssl3prot.h', 50 '<(ssl_directory)/ssl/ssl3prot.h',
(...skipping 18 matching lines...) Expand all
70 '<(ssl_directory)/ssl/sslsecur.c', 69 '<(ssl_directory)/ssl/sslsecur.c',
71 '<(ssl_directory)/ssl/sslsnce.c', 70 '<(ssl_directory)/ssl/sslsnce.c',
72 '<(ssl_directory)/ssl/sslsock.c', 71 '<(ssl_directory)/ssl/sslsock.c',
73 '<(ssl_directory)/ssl/sslt.h', 72 '<(ssl_directory)/ssl/sslt.h',
74 '<(ssl_directory)/ssl/ssltrace.c', 73 '<(ssl_directory)/ssl/ssltrace.c',
75 '<(ssl_directory)/ssl/sslver.c', 74 '<(ssl_directory)/ssl/sslver.c',
76 '<(ssl_directory)/ssl/unix_err.c', 75 '<(ssl_directory)/ssl/unix_err.c',
77 '<(ssl_directory)/ssl/unix_err.h', 76 '<(ssl_directory)/ssl/unix_err.h',
78 '<(ssl_directory)/ssl/win32err.c', 77 '<(ssl_directory)/ssl/win32err.c',
79 '<(ssl_directory)/ssl/win32err.h', 78 '<(ssl_directory)/ssl/win32err.h',
79 # Changed by Dart: All files under '<(ssl_directory)/ssl/bodge' removed.
80 ], 80 ],
81 # Changed by Dart: '<(ssl_directory)/' added to all paths.
81 'sources!': [ 82 'sources!': [
82 '<(ssl_directory)/ssl/os2_err.c', 83 '<(ssl_directory)/ssl/os2_err.c',
83 '<(ssl_directory)/ssl/os2_err.h', 84 '<(ssl_directory)/ssl/os2_err.h',
84 ], 85 ],
85 'defines': [ 86 'defines': [
86 'NSS_ENABLE_ECC', 87 'NSS_ENABLE_ECC',
87 'NSS_ENABLE_ZLIB', 88 'NSS_ENABLE_ZLIB',
88 'USE_UTIL_DIRECTLY', 89 'USE_UTIL_DIRECTLY',
89 ], 90 ],
90 'defines!': [ 91 'defines!': [
91 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. 92 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet.
92 'NO_NSPR_10_SUPPORT', 93 'NO_NSPR_10_SUPPORT',
93 ], 94 ],
94 'dependencies': [ 95 'dependencies': [
95 'zlib.gyp:zlib_dart', 96 # Changed by Dart.
97 'zlib.gyp:zlib_dart', # Added by Dart (the _dart postfix)
96 # Dart: Start of copy of code from 'bodge' conditions section below. 98 # Dart: Start of copy of code from 'bodge' conditions section below.
97 'nss.gyp:nspr_dart', 99 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix)
98 'nss.gyp:nss_dart', 100 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix)
99 ], 101 ],
100 'export_dependent_settings': [ 102 'export_dependent_settings': [
101 'nss.gyp:nspr_dart', 103 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix)
102 'nss.gyp:nss_dart', 104 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix)
103 ], 105 ],
104 'direct_dependent_settings': { 106 'direct_dependent_settings': {
105 'include_dirs': [ 107 'include_dirs': [
106 '<(ssl_directory)/ssl', 108 '<(ssl_directory)/ssl',
107 ], 109 ],
108 'defines': [ 110 'defines': [
109 'NSS_PLATFORM_CLIENT_AUTH', 111 'NSS_PLATFORM_CLIENT_AUTH',
110 ], 112 ],
111 # Dart: End of copy of code from bodge conditions section. 113 # Dart: End of copy of code from bodge conditions section.
112 }, 114 },
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 'Debug_Base': { 161 'Debug_Base': {
160 'defines': [ 162 'defines': [
161 'DEBUG', 163 'DEBUG',
162 ], 164 ],
163 }, 165 },
164 }, 166 },
165 }, 167 },
166 ], 168 ],
167 }]], 169 }]],
168 } 170 }
OLDNEW
« no previous file with comments | « dart/runtime/bin/net/sqlite.gyp ('k') | dart/runtime/bin/net/zlib.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698