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

Side by Side Diff: gyp/zlib.gyp

Issue 179843003: Fix valgrind bot errors introduced in f84722e4777. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 9 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 | « no previous file | 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 2014 Google Inc. 1 # Copyright 2014 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'variables': { 7 'variables': {
8 'skia_warnings_as_errors': 0, 8 'skia_warnings_as_errors': 0,
9 }, 9 },
10 'targets': [ 10 'targets': [
11 { 11 {
12 'target_name': 'zlib', 12 'target_name': 'zlib',
13 'conditions': [ 13 'conditions': [
14 [ 'skia_zlib_static', 14 [ 'skia_zlib_static',
15 { 15 {
16 'type': 'static_library', 16 'type': 'static_library',
17 'include_dirs': [ 17 'include_dirs': [
18 '../third_party/externals/zlib', 18 '../third_party/externals/zlib',
19 ], 19 ],
20 'direct_dependent_settings': { 20 'direct_dependent_settings': {
21 'defines': [ 21 'defines': [
22 'SK_ZLIB_INCLUDE=<zlib.h>', 22 'SK_ZLIB_INCLUDE="zlib.h"',
23 ], 23 ],
24 'include_dirs': [ 24 'include_dirs': [
25 '../third_party/externals/zlib', 25 '../third_party/externals/zlib',
26 ], 26 ],
27 }, 27 },
28 'sources': [ 28 'sources': [
29 '../third_party/externals/zlib/src/adler32.c', 29 '../third_party/externals/zlib/src/adler32.c',
30 '../third_party/externals/zlib/src/compress.c', 30 '../third_party/externals/zlib/src/compress.c',
31 '../third_party/externals/zlib/src/crc32.c', 31 '../third_party/externals/zlib/src/crc32.c',
32 '../third_party/externals/zlib/src/deflate.c', 32 '../third_party/externals/zlib/src/deflate.c',
(...skipping 12 matching lines...) Expand all
45 }, { # not skia_zlib_static 45 }, { # not skia_zlib_static
46 'type': 'none', 46 'type': 'none',
47 'direct_dependent_settings': { 47 'direct_dependent_settings': {
48 'conditions': [ 48 'conditions': [
49 [ 'skia_android_framework', { 49 [ 'skia_android_framework', {
50 'include_dirs': [ 50 'include_dirs': [
51 'external/zlib', 51 'external/zlib',
52 ], 52 ],
53 }, { 53 }, {
54 'defines': [ 54 'defines': [
55 'SK_ZLIB_INCLUDE=<zlib.h>', 55 'SK_SYSTEM_ZLIB=1',
56 ], 56 ],
57 }] 57 }]
58 ], 58 ],
59 'link_settings': { 59 'link_settings': {
60 'conditions': [ 60 'conditions': [
61 [ 'skia_os == "mac" or skia_os == "ios"', { 61 [ 'skia_os == "mac" or skia_os == "ios"', {
62 'libraries': [ 62 'libraries': [
63 '$(SDKROOT)/usr/lib/libz.dylib', 63 '$(SDKROOT)/usr/lib/libz.dylib',
64 ] 64 ]
65 }, { # skia_os != "mac" and skia_os != "ios" 65 }, { # skia_os != "mac" and skia_os != "ios"
66 'libraries': [ 66 'libraries': [
67 '-lz', 67 '-lz',
68 ] 68 ]
69 }], 69 }],
70 ], 70 ],
71 } 71 }
72 }, 72 },
73 } 73 }
74 ] 74 ]
75 ] 75 ]
76 } 76 }
77 ] 77 ]
78 } 78 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698