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

Side by Side Diff: third_party/zlib/zlib.gyp

Issue 13564004: Complete update of zlib from 1.2.3 to 1.2.5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: actually fix patch Created 7 years, 8 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 | « third_party/zlib/zconf.h ('k') | 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 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 [ 'OS=="none"', { 8 [ 'OS=="none"', {
9 # Because we have a patched zlib, we cannot use the system libz. 9 # Because we have a patched zlib, we cannot use the system libz.
10 # TODO(pvalchev): OpenBSD is purposefully left out, as the system 10 # TODO(pvalchev): OpenBSD is purposefully left out, as the system
(...skipping 11 matching lines...) Expand all
22 'type': 'static_library', 22 'type': 'static_library',
23 'conditions': [ 23 'conditions': [
24 ['use_system_zlib==0', { 24 ['use_system_zlib==0', {
25 'sources': [ 25 'sources': [
26 'adler32.c', 26 'adler32.c',
27 'compress.c', 27 'compress.c',
28 'crc32.c', 28 'crc32.c',
29 'crc32.h', 29 'crc32.h',
30 'deflate.c', 30 'deflate.c',
31 'deflate.h', 31 'deflate.h',
32 'gzio.c', 32 'gzclose.c',
33 'gzguts.h',
34 'gzlib.c',
35 'gzread.c',
36 'gzwrite.c',
33 'infback.c', 37 'infback.c',
34 'inffast.c', 38 'inffast.c',
35 'inffast.h', 39 'inffast.h',
36 'inffixed.h', 40 'inffixed.h',
37 'inflate.c', 41 'inflate.c',
38 'inflate.h', 42 'inflate.h',
39 'inftrees.c', 43 'inftrees.c',
40 'inftrees.h', 44 'inftrees.h',
41 'mozzconf.h', 45 'mozzconf.h',
42 'trees.c', 46 'trees.c',
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 ], 157 ],
154 }, 158 },
155 'cflags': [ 159 'cflags': [
156 '-Wno-parentheses-equality', 160 '-Wno-parentheses-equality',
157 ], 161 ],
158 }], 162 }],
159 ], 163 ],
160 } 164 }
161 ], 165 ],
162 } 166 }
OLDNEW
« no previous file with comments | « third_party/zlib/zconf.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698