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

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

Issue 1319703002: Breaking Change: merge BoringSSL branch into master (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 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 | « runtime/bin/net/sqlite.gyp ('k') | runtime/bin/secure_socket.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
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
3 # found in the LICENSE file.
4
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
7 # BSD-style license that can be found in the LICENSE file.
8
9 # This file is a modified copy of Chromium's src/net/third_party/nss/ssl.gyp.
10 # Revision 291806 (this should agree with "nss_rev" in DEPS).
11
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):
14 # 'configurations': {
15 # 'Debug_Base': {
16 # + 'inherit_from': ['Dart_Base'],
17 # 'defines': [
18 # 'DEBUG',
19 # ],
20 # },
21 # },
22
23 {
24 # Conditions section for ssl-bodge (Compiling SSL on linux using system
25 # NSS and NSPR libraries) removed:
26 # 'conditions': [
27 # [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
28 # ...
29 # }]],
30
31 # Added by Dart. All Dart comments refer to the following block or line.
32 'includes': [
33 '../../tools/gyp/runtime-configurations.gypi',
34 '../../tools/gyp/nss_configurations.gypi',
35 ],
36 # Added by Dart.
37 'variables': {
38 'ssl_directory': '../../../third_party/net_nss',
39 'os_posix': 0,
40 },
41 # Added by Dart. We do not indent, so diffs with the original are clearer.
42 'conditions': [[ 'dart_io_support==1', {
43 'targets': [
44 {
45 'target_name': 'libssl_dart', # Added by Dart (the _dart postfix)
46 'type': 'static_library',
47 'toolsets':['host','target'],
48 # Changed by Dart: '<(ssl_directory)/' added to all paths.
49 'sources': [
50 '<(ssl_directory)/ssl/authcert.c',
51 '<(ssl_directory)/ssl/cmpcert.c',
52 '<(ssl_directory)/ssl/derive.c',
53 '<(ssl_directory)/ssl/dtlscon.c',
54 '<(ssl_directory)/ssl/os2_err.c',
55 '<(ssl_directory)/ssl/os2_err.h',
56 '<(ssl_directory)/ssl/preenc.h',
57 '<(ssl_directory)/ssl/prelib.c',
58 '<(ssl_directory)/ssl/ssl.h',
59 '<(ssl_directory)/ssl/ssl3con.c',
60 '<(ssl_directory)/ssl/ssl3ecc.c',
61 '<(ssl_directory)/ssl/ssl3ext.c',
62 '<(ssl_directory)/ssl/ssl3gthr.c',
63 '<(ssl_directory)/ssl/ssl3prot.h',
64 '<(ssl_directory)/ssl/sslauth.c',
65 '<(ssl_directory)/ssl/sslcon.c',
66 '<(ssl_directory)/ssl/ssldef.c',
67 '<(ssl_directory)/ssl/sslenum.c',
68 '<(ssl_directory)/ssl/sslerr.c',
69 '<(ssl_directory)/ssl/sslerr.h',
70 '<(ssl_directory)/ssl/SSLerrs.h',
71 '<(ssl_directory)/ssl/sslerrstrs.c',
72 '<(ssl_directory)/ssl/sslgathr.c',
73 '<(ssl_directory)/ssl/sslimpl.h',
74 '<(ssl_directory)/ssl/sslinfo.c',
75 '<(ssl_directory)/ssl/sslinit.c',
76 '<(ssl_directory)/ssl/sslmutex.c',
77 '<(ssl_directory)/ssl/sslmutex.h',
78 '<(ssl_directory)/ssl/sslnonce.c',
79 '<(ssl_directory)/ssl/sslplatf.c',
80 '<(ssl_directory)/ssl/sslproto.h',
81 '<(ssl_directory)/ssl/sslreveal.c',
82 '<(ssl_directory)/ssl/sslsecur.c',
83 '<(ssl_directory)/ssl/sslsnce.c',
84 '<(ssl_directory)/ssl/sslsock.c',
85 '<(ssl_directory)/ssl/sslt.h',
86 '<(ssl_directory)/ssl/ssltrace.c',
87 '<(ssl_directory)/ssl/sslver.c',
88 '<(ssl_directory)/ssl/unix_err.c',
89 '<(ssl_directory)/ssl/unix_err.h',
90 '<(ssl_directory)/ssl/win32err.c',
91 '<(ssl_directory)/ssl/win32err.h',
92 # Changed by Dart: All files under '<(ssl_directory)/ssl/bodge' removed.
93 ],
94 # Changed by Dart: '<(ssl_directory)/' added to all paths.
95 'sources!': [
96 '<(ssl_directory)/ssl/os2_err.c',
97 '<(ssl_directory)/ssl/os2_err.h',
98 ],
99 'defines': [
100 'NO_PKCS11_BYPASS',
101 'NSS_ENABLE_ECC',
102 'USE_UTIL_DIRECTLY',
103 ],
104 'defines!': [
105 'DEBUG',
106 ],
107 'dependencies': [
108 # Changed by Dart.
109 'zlib.gyp:zlib_dart', # Added by Dart (the _dart postfix)
110 # Dart: Start of copy of code from 'bodge' conditions section below.
111 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix)
112 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix)
113 ],
114 'export_dependent_settings': [
115 'nss.gyp:nspr_dart', # Added by Dart (the _dart postfix)
116 'nss.gyp:nss_dart', # Added by Dart (the _dart postfix)
117 ],
118 'direct_dependent_settings': {
119 'include_dirs': [
120 '<(ssl_directory)/ssl',
121 ],
122 'defines': [
123 'NSS_PLATFORM_CLIENT_AUTH',
124 ],
125 # Dart: End of copy of code from bodge conditions section.
126 },
127 'msvs_disabled_warnings': [4018, 4244, 4267],
128 'conditions': [
129 ['component == "shared_library"', {
130 'conditions': [
131 ['OS == "mac" or OS == "ios"', {
132 'xcode_settings': {
133 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
134 },
135 }],
136 ['OS == "win"', {
137 'sources': [
138 'ssl/exports_win.def',
139 ],
140 }],
141 ['os_posix == 1 and OS != "mac" and OS != "ios"', {
142 'cflags!': ['-fvisibility=hidden'],
143 }],
144 ],
145 }],
146 [ 'clang == 1', {
147 'cflags': [
148 # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the
149 # system's cert.h because cert.h isn't in chromium's repo.
150 '-Wno-incompatible-pointer-types',
151
152 # There is a broken header guard in /usr/include/nss/secmod.h:
153 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
154 '-Wno-header-guard',
155 ],
156 }],
157 [ 'OS == "linux"', {
158 'link_settings': {
159 'libraries': [
160 '-ldl',
161 ],
162 },
163 # Added by Dart.
164 'defines': [
165 'XP_UNIX',
166 'NSS_PLATFORM_CLIENT_AUTH',
167 'NSS_USE_STATIC_LIBS',
168 ],
169 }],
170 [ 'OS == "mac" or OS == "ios"', {
171 'defines': [
172 'XP_UNIX',
173 'DARWIN',
174 'XP_MACOSX',
175 ],
176 }],
177 [ 'OS == "mac"', {
178 'link_settings': {
179 'libraries': [
180 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
181 ],
182 },
183 }],
184 [ 'OS == "win"', {
185 'sources!': [
186 '<(ssl_directory)/ssl/unix_err.c',
187 '<(ssl_directory)/ssl/unix_err.h',
188 ],
189 },
190 { # else: OS != "win"
191 'sources!': [
192 '<(ssl_directory)/ssl/win32err.c',
193 '<(ssl_directory)/ssl/win32err.h',
194 ],
195 },
196 ],
197 # Dart: Conditions sections for ssl/bodge removed.
198 # [ 'os_posix == 1 and OS != "mac" and OS != "ios", {
199 # ...
200 # ],
201 # [ 'OS == "mac" or OS == "ios" or OS == "win"', {
202 # ...
203 # ],
204 ],
205 'configurations': {
206 'Debug_Base': {
207 'inherit_from': ['Dart_Base'],
208 'defines': [
209 'DEBUG',
210 ],
211 },
212 },
213 },
214 ],
215 }]],
216 }
OLDNEW
« no previous file with comments | « runtime/bin/net/sqlite.gyp ('k') | runtime/bin/secure_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698