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

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

Issue 11369152: Disable NSS build targets in a Dartium build. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Add comma, comment. 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
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 165464 (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.
30 'conditions': [[ 'in_dartium==0', {
29 'targets': [ 31 'targets': [
30 { 32 {
31 'target_name': 'libssl_dart', 33 'target_name': 'libssl_dart',
32 'type': 'static_library', 34 'type': 'static_library',
33 # Changed by Dart: '<(ssl_directory)/' added to all paths. 35 # Changed by Dart: '<(ssl_directory)/' added to all paths.
34 'sources': [ 36 'sources': [
35 '<(ssl_directory)/ssl/authcert.c', 37 '<(ssl_directory)/ssl/authcert.c',
36 '<(ssl_directory)/ssl/cmpcert.c', 38 '<(ssl_directory)/ssl/cmpcert.c',
37 '<(ssl_directory)/ssl/derive.c', 39 '<(ssl_directory)/ssl/derive.c',
38 '<(ssl_directory)/ssl/dtls1con.c', 40 '<(ssl_directory)/ssl/dtls1con.c',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 ], 157 ],
156 'configurations': { 158 'configurations': {
157 'Debug_Base': { 159 'Debug_Base': {
158 'defines': [ 160 'defines': [
159 'DEBUG', 161 'DEBUG',
160 ], 162 ],
161 }, 163 },
162 }, 164 },
163 }, 165 },
164 ], 166 ],
167 }]],
165 } 168 }
OLDNEW
« no previous file with comments | « runtime/bin/net/sqlite.gyp ('k') | runtime/bin/net/zlib.gyp » ('j') | tools/gyp/all.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698