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

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

Issue 64113002: Update NSS to Chromium revision 232552 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 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
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 199075 (this should agree with "nss_rev" in DEPS). 10 # Revision 232552 (this should agree with "nss_rev" in DEPS).
11 11
12 # The following modification was made to make sure we have the same 12 # The following modification was made to make sure we have the same
13 # xcode_settings on all configurations (otherwise we can't build with ninja): 13 # xcode_settings on all configurations (otherwise we can't build with ninja):
14 # 'configurations': { 14 # 'configurations': {
15 # 'Debug_Base': { 15 # 'Debug_Base': {
16 # + 'inherit_from': ['Dart_Base'], 16 # + 'inherit_from': ['Dart_Base'],
17 # 'defines': [ 17 # 'defines': [
18 # 'DEBUG', 18 # 'DEBUG',
19 # ], 19 # ],
20 # }, 20 # },
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 # Changed by Dart: '<(ssl_directory)/' added to all paths. 94 # Changed by Dart: '<(ssl_directory)/' added to all paths.
95 'sources!': [ 95 'sources!': [
96 '<(ssl_directory)/ssl/os2_err.c', 96 '<(ssl_directory)/ssl/os2_err.c',
97 '<(ssl_directory)/ssl/os2_err.h', 97 '<(ssl_directory)/ssl/os2_err.h',
98 ], 98 ],
99 'defines': [ 99 'defines': [
100 'NO_PKCS11_BYPASS', 100 'NO_PKCS11_BYPASS',
101 'NSS_ENABLE_ECC', 101 'NSS_ENABLE_ECC',
102 'USE_UTIL_DIRECTLY', 102 'USE_UTIL_DIRECTLY',
103 ], 103 ],
104 'defines!': [
105 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet.
106 'NO_NSPR_10_SUPPORT',
107 'DEBUG',
108 ],
109 'dependencies': [ 104 'dependencies': [
110 # Changed by Dart. 105 # Changed by Dart.
111 'zlib.gyp:zlib_dart', # Added by Dart (the _dart postfix) 106 'zlib.gyp:zlib_dart', # Added by Dart (the _dart postfix)
112 # Dart: Start of copy of code from 'bodge' conditions section below. 107 # Dart: Start of copy of code from 'bodge' conditions section below.
113 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix) 108 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix)
114 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix) 109 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix)
115 ], 110 ],
116 'export_dependent_settings': [ 111 'export_dependent_settings': [
117 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix) 112 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix)
118 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix) 113 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix)
(...skipping 24 matching lines...) Expand all
143 ['os_posix == 1 and OS != "mac" and OS != "ios"', { 138 ['os_posix == 1 and OS != "mac" and OS != "ios"', {
144 'cflags!': ['-fvisibility=hidden'], 139 'cflags!': ['-fvisibility=hidden'],
145 }], 140 }],
146 ], 141 ],
147 }], 142 }],
148 [ 'clang == 1', { 143 [ 'clang == 1', {
149 'cflags': [ 144 'cflags': [
150 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the 145 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the
151 # system's cert.h because cert.h isn't in chromium's repo. 146 # system's cert.h because cert.h isn't in chromium's repo.
152 '-Wno-incompatible-pointer-types', 147 '-Wno-incompatible-pointer-types',
148
149 # There is a broken header guard in /usr/include/nss/secmod.h:
150 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
151 '-Wno-header-guard',
153 ], 152 ],
154 }], 153 }],
155 # Added by Dart.
156 [ 'OS == "linux"', { 154 [ 'OS == "linux"', {
155 'link_settings': {
156 'libraries': [
157 '-ldl',
158 ],
159 },
160 # Added by Dart.
157 'defines': [ 161 'defines': [
158 'XP_UNIX', 162 'XP_UNIX',
159 'NSS_PLATFORM_CLIENT_AUTH', 163 'NSS_PLATFORM_CLIENT_AUTH',
160 'NSS_USE_STATIC_LIBS', 164 'NSS_USE_STATIC_LIBS',
161 ], 165 ],
162 }], 166 }],
163 [ 'OS == "mac" or OS == "ios"', { 167 [ 'OS == "mac" or OS == "ios"', {
164 'defines': [ 168 'defines': [
165 'XP_UNIX', 169 'XP_UNIX',
166 'DARWIN', 170 'DARWIN',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 'inherit_from': ['Dart_Base'], 204 'inherit_from': ['Dart_Base'],
201 'defines': [ 205 'defines': [
202 'DEBUG', 206 'DEBUG',
203 ], 207 ],
204 }, 208 },
205 }, 209 },
206 }, 210 },
207 ], 211 ],
208 }]], 212 }]],
209 } 213 }
OLDNEW
« no previous file with comments | « runtime/bin/net/sqlite.gyp ('k') | runtime/bin/net/zlib.gyp » ('j') | runtime/bin/net/zlib.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698