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

Side by Side Diff: dart/runtime/bin/net/zlib.gyp

Issue 11413141: Roll NSS to 169195. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: 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
« no previous file with comments | « dart/runtime/bin/net/ssl.gyp ('k') | dart/runtime/tools/gyp/nss_configurations.gypi » ('j') | 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 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 169195 (this should agree with "nss_rev" in DEPS).
11 { 11 {
12 # Added by Dart. All Dart comments refer to the following block or line. 12 # Added by Dart. All Dart comments refer to the following block or line.
13 'includes': [ 13 'includes': [
14 '../../tools/gyp/runtime-configurations.gypi', 14 '../../tools/gyp/runtime-configurations.gypi',
15 '../../tools/gyp/nss_configurations.gypi', 15 '../../tools/gyp/nss_configurations.gypi',
16 ], 16 ],
17 'variables': { 17 'variables': {
18 # Added by Dart. 18 # Added by Dart.
19 'zlib_path': '../../../third_party/zlib', 19 'zlib_path': '../../../third_party/zlib',
20 'conditions': [ 20 'conditions': [
21 [ 'OS=="none"', { 21 [ 'OS=="none"', {
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. 32 # Added by Dart. We do not indent, so diffs with the original are clearer.
33 'conditions': [[ 'dart_io_support==1', { 33 'conditions': [[ 'dart_io_support==1', {
34 'targets': [ 34 'targets': [
35 { 35 {
36 'target_name': 'zlib_dart', 36 'target_name': 'zlib_dart', # Added by Dart (the _dart postfix)
37 'type': 'static_library', 37 'type': 'static_library',
38 'conditions': [ 38 'conditions': [
39 ['use_system_zlib==0', { 39 ['use_system_zlib==0', {
40 # Changed by Dart: '<(zlib_directory)/' added to all paths. 40 # Changed by Dart: '<(zlib_directory)/' added to all paths.
41 'sources': [ 41 'sources': [
42 '<(zlib_path)/adler32.c', 42 '<(zlib_path)/adler32.c',
43 '<(zlib_path)/compress.c', 43 '<(zlib_path)/compress.c',
44 '<(zlib_path)/crc32.c', 44 '<(zlib_path)/crc32.c',
45 '<(zlib_path)/crc32.h', 45 '<(zlib_path)/crc32.h',
46 '<(zlib_path)/deflate.c', 46 '<(zlib_path)/deflate.c',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 ], 89 ],
90 'link_settings': { 90 'link_settings': {
91 'libraries': [ 91 'libraries': [
92 '-lz', 92 '-lz',
93 ], 93 ],
94 }, 94 },
95 }], 95 }],
96 ], 96 ],
97 }, 97 },
98 { 98 {
99 'target_name': 'minizip_dart', 99 'target_name': 'minizip_dart', # Added by Dart (the _dart postfix)
100 'type': 'static_library', 100 'type': 'static_library',
101 'conditions': [ 101 'conditions': [
102 ['use_system_minizip==0', { 102 ['use_system_minizip==0', {
103 'sources': [ 103 'sources': [
104 '<(zlib_path)/contrib/minizip/ioapi.c', 104 '<(zlib_path)/contrib/minizip/ioapi.c',
105 '<(zlib_path)/contrib/minizip/ioapi.h', 105 '<(zlib_path)/contrib/minizip/ioapi.h',
106 '<(zlib_path)/contrib/minizip/iowin32.c', 106 '<(zlib_path)/contrib/minizip/iowin32.c',
107 '<(zlib_path)/contrib/minizip/iowin32.h', 107 '<(zlib_path)/contrib/minizip/iowin32.h',
108 '<(zlib_path)/contrib/minizip/unzip.c', 108 '<(zlib_path)/contrib/minizip/unzip.c',
109 '<(zlib_path)/contrib/minizip/unzip.h', 109 '<(zlib_path)/contrib/minizip/unzip.h',
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 }, 161 },
162 'cflags': [ 162 'cflags': [
163 '-Wno-parentheses-equality', 163 '-Wno-parentheses-equality',
164 ], 164 ],
165 }], 165 }],
166 ], 166 ],
167 } 167 }
168 ], 168 ],
169 }]], 169 }]],
170 } 170 }
OLDNEW
« no previous file with comments | « dart/runtime/bin/net/ssl.gyp ('k') | dart/runtime/tools/gyp/nss_configurations.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698