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

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

Issue 14499010: Make ninja build on mac work (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 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 # 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 169195 (this should agree with "nss_rev" in DEPS). 10 # Revision 169195 (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
11 { 23 {
12 # Conditions section for ssl-bodge (Compiling SSL on linux using system 24 # Conditions section for ssl-bodge (Compiling SSL on linux using system
13 # NSS and NSPR libraries) removed: 25 # NSS and NSPR libraries) removed:
14 # 'conditions': [ 26 # 'conditions': [
15 # [ 'os_posix == 1 and OS != "mac" and OS != "ios"', { 27 # [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
16 # ... 28 # ...
17 # }]], 29 # }]],
18 30
19 # Added by Dart. All Dart comments refer to the following block or line. 31 # Added by Dart. All Dart comments refer to the following block or line.
20 'includes': [ 32 'includes': [
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 # Dart: Conditions sections for ssl/bodge removed. 164 # Dart: Conditions sections for ssl/bodge removed.
153 # [ 'os_posix == 1 and OS != "mac" and OS != "ios", { 165 # [ 'os_posix == 1 and OS != "mac" and OS != "ios", {
154 # ... 166 # ...
155 # ], 167 # ],
156 # [ 'OS == "mac" or OS == "ios" or OS == "win"', { 168 # [ 'OS == "mac" or OS == "ios" or OS == "win"', {
157 # ... 169 # ...
158 # ], 170 # ],
159 ], 171 ],
160 'configurations': { 172 'configurations': {
161 'Debug_Base': { 173 'Debug_Base': {
174 'inherit_from': ['Dart_Base'],
162 'defines': [ 175 'defines': [
163 'DEBUG', 176 'DEBUG',
164 ], 177 ],
165 }, 178 },
166 }, 179 },
167 }, 180 },
168 ], 181 ],
169 }]], 182 }]],
170 } 183 }
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