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

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

Issue 23271006: libpng 1.6.3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove trailing whitespaces. Created 7 years, 3 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
« 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'],
9 'type': 'static_library', 10 'type': 'static_library',
10 'sources': [ 11 'sources': [
11 'adler32.c', 12 'adler32.c',
12 'compress.c', 13 'compress.c',
13 'crc32.c', 14 'crc32.c',
14 'crc32.h', 15 'crc32.h',
15 'deflate.c', 16 'deflate.c',
16 'deflate.h', 17 'deflate.h',
17 'gzclose.c', 18 'gzclose.c',
18 'gzguts.h', 19 'gzguts.h',
(...skipping 21 matching lines...) Expand all
40 '.', 41 '.',
41 ], 42 ],
42 'direct_dependent_settings': { 43 'direct_dependent_settings': {
43 'include_dirs': [ 44 'include_dirs': [
44 '.', 45 '.',
45 ], 46 ],
46 }, 47 },
47 'conditions': [ 48 'conditions': [
48 ['OS!="win"', { 49 ['OS!="win"', {
49 'product_name': 'chrome_zlib', 50 'product_name': 'chrome_zlib',
50 }], ['OS=="android"', {
51 'toolsets': ['target', 'host'],
52 }], 51 }],
53 ], 52 ],
54 }, 53 },
55 { 54 {
56 'target_name': 'minizip', 55 'target_name': 'minizip',
57 'type': 'static_library', 56 'type': 'static_library',
58 'sources': [ 57 'sources': [
59 'contrib/minizip/ioapi.c', 58 'contrib/minizip/ioapi.c',
60 'contrib/minizip/ioapi.h', 59 'contrib/minizip/ioapi.h',
61 'contrib/minizip/iowin32.c', 60 'contrib/minizip/iowin32.c',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 ], 101 ],
103 }, 102 },
104 'cflags': [ 103 'cflags': [
105 '-Wno-parentheses-equality', 104 '-Wno-parentheses-equality',
106 ], 105 ],
107 }], 106 }],
108 ], 107 ],
109 }, 108 },
110 ], 109 ],
111 } 110 }
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