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

Side by Side Diff: runtime/bin/net/nss.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 deps/third_party/nss/nss.gyp. 9 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp.
10 # Revision 165464 (this should agree with "nss_rev" in DEPS). 10 # Revision 165464 (this should agree with "nss_rev" in DEPS).
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 'CharacterSet': '0' 77 'CharacterSet': '0'
78 } 78 }
79 } 79 }
80 }, 80 },
81 'defines!': [ 81 'defines!': [
82 'WIN32_LEAN_AND_MEAN', 82 'WIN32_LEAN_AND_MEAN',
83 ], 83 ],
84 }], 84 }],
85 ], 85 ],
86 }, 86 },
87 # Added by Dart. We do not indent, so diffs with the original are clearer.
88 'conditions': [[ 'in_dartium==0', {
87 'targets': [ 89 'targets': [
88 { 90 {
89 'target_name': 'nspr_dart', 91 'target_name': 'nspr_dart',
90 'product_name': 'crnspr', 92 'product_name': 'crnspr',
91 'type': '<(component)', 93 'type': '<(component)',
92 # Changed by Dart: '<(nss_directory)/' added to all paths. 94 # Changed by Dart: '<(nss_directory)/' added to all paths.
93 'sources': [ 95 'sources': [
94 # Added by Dart. 96 # Added by Dart.
95 'os_linux.S', 97 'os_linux.S',
96 '<(nss_directory)/mozilla/nsprpub/lib/ds/plarena.c', 98 '<(nss_directory)/mozilla/nsprpub/lib/ds/plarena.c',
(...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 '-Wno-conversion', 1265 '-Wno-conversion',
1264 '-Wno-incompatible-pointer-types', 1266 '-Wno-incompatible-pointer-types',
1265 '-Wno-logical-op-parentheses', 1267 '-Wno-logical-op-parentheses',
1266 '-Wno-switch', 1268 '-Wno-switch',
1267 '-Wno-tautological-compare', 1269 '-Wno-tautological-compare',
1268 ], 1270 ],
1269 }], 1271 }],
1270 ], 1272 ],
1271 }, 1273 },
1272 ], 1274 ],
1275 }]],
1273 } 1276 }
OLDNEW
« no previous file with comments | « runtime/bin/bin.gypi ('k') | runtime/bin/net/sqlite.gyp » ('j') | tools/gyp/all.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698