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

Side by Side Diff: runtime/bin/net/zlib.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 src/third_party/zlib/zlib.gyp from Chromium. 9 # This file is a modified copy of src/third_party/zlib/zlib.gyp from Chromium.
10 # Revision 165464 (this should agree with "nss_rev" in DEPS). 10 # Revision 165464 (this should agree with "nss_rev" in DEPS).
(...skipping 11 matching lines...) Expand all
22 # Because we have a patched zlib, we cannot use the system libz. 22 # Because we have a patched zlib, we cannot use the system libz.
23 # TODO(pvalchev): OpenBSD is purposefully left out, as the system 23 # TODO(pvalchev): OpenBSD is purposefully left out, as the system
24 # zlib brings up an incompatibility that breaks rendering. 24 # zlib brings up an incompatibility that breaks rendering.
25 'use_system_zlib%': 1, 25 'use_system_zlib%': 1,
26 }, { 26 }, {
27 'use_system_zlib%': 0, 27 'use_system_zlib%': 0,
28 }], 28 }],
29 ], 29 ],
30 'use_system_minizip%': 0, 30 'use_system_minizip%': 0,
31 }, 31 },
32 # Added by Dart. We do not indent, so diffs with the original are clearer.
33 'conditions': [[ 'in_dartium==0', {
32 'targets': [ 34 'targets': [
33 { 35 {
34 'target_name': 'zlib_dart', 36 'target_name': 'zlib_dart',
35 'type': 'static_library', 37 'type': 'static_library',
36 'conditions': [ 38 'conditions': [
37 ['use_system_zlib==0', { 39 ['use_system_zlib==0', {
38 # Changed by Dart: '<(zlib_directory)/' added to all paths. 40 # Changed by Dart: '<(zlib_directory)/' added to all paths.
39 'sources': [ 41 'sources': [
40 '<(zlib_path)/adler32.c', 42 '<(zlib_path)/adler32.c',
41 '<(zlib_path)/compress.c', 43 '<(zlib_path)/compress.c',
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 '-Wno-parentheses-equality', 159 '-Wno-parentheses-equality',
158 ], 160 ],
159 }, 161 },
160 'cflags': [ 162 'cflags': [
161 '-Wno-parentheses-equality', 163 '-Wno-parentheses-equality',
162 ], 164 ],
163 }], 165 }],
164 ], 166 ],
165 } 167 }
166 ], 168 ],
169 }]],
167 } 170 }
OLDNEW
« no previous file with comments | « runtime/bin/net/ssl.gyp ('k') | runtime/dart-runtime.gyp » ('j') | tools/gyp/all.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698