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

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

Issue 23494067: Revert "libpng 1.6.3" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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/libpng/pngwutil.c ('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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'zlib', 8 'target_name': 'zlib',
9 'toolsets': ['target', 'host'],
10 'type': 'static_library', 9 'type': 'static_library',
11 'sources': [ 10 'sources': [
12 'adler32.c', 11 'adler32.c',
13 'compress.c', 12 'compress.c',
14 'crc32.c', 13 'crc32.c',
15 'crc32.h', 14 'crc32.h',
16 'deflate.c', 15 'deflate.c',
17 'deflate.h', 16 'deflate.h',
18 'gzclose.c', 17 'gzclose.c',
19 'gzguts.h', 18 'gzguts.h',
(...skipping 21 matching lines...) Expand all
41 '.', 40 '.',
42 ], 41 ],
43 'direct_dependent_settings': { 42 'direct_dependent_settings': {
44 'include_dirs': [ 43 'include_dirs': [
45 '.', 44 '.',
46 ], 45 ],
47 }, 46 },
48 'conditions': [ 47 'conditions': [
49 ['OS!="win"', { 48 ['OS!="win"', {
50 'product_name': 'chrome_zlib', 49 'product_name': 'chrome_zlib',
50 }], ['OS=="android"', {
51 'toolsets': ['target', 'host'],
51 }], 52 }],
52 ], 53 ],
53 }, 54 },
54 { 55 {
55 'target_name': 'minizip', 56 'target_name': 'minizip',
56 'type': 'static_library', 57 'type': 'static_library',
57 'sources': [ 58 'sources': [
58 'contrib/minizip/ioapi.c', 59 'contrib/minizip/ioapi.c',
59 'contrib/minizip/ioapi.h', 60 'contrib/minizip/ioapi.h',
60 'contrib/minizip/iowin32.c', 61 'contrib/minizip/iowin32.c',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ], 102 ],
102 }, 103 },
103 'cflags': [ 104 'cflags': [
104 '-Wno-parentheses-equality', 105 '-Wno-parentheses-equality',
105 ], 106 ],
106 }], 107 }],
107 ], 108 ],
108 }, 109 },
109 ], 110 ],
110 } 111 }
OLDNEW
« no previous file with comments | « third_party/libpng/pngwutil.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698