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

Side by Side Diff: gyp/libwebp.gyp

Issue 803213002: Rolling libwebp broke our iOS builds. Silence warnings instead. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years 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 (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 'skia_warnings_as_errors': 0, 7 'skia_warnings_as_errors': 0,
8 'conditions':[ 8 'conditions':[
9 ['skia_android_framework == 1', { 9 ['skia_android_framework == 1', {
10 'use_system_libwebp': 1, 10 'use_system_libwebp': 1,
(...skipping 18 matching lines...) Expand all
29 '../third_party/externals/libwebp/src/dec/idec.c', 29 '../third_party/externals/libwebp/src/dec/idec.c',
30 '../third_party/externals/libwebp/src/dec/io.c', 30 '../third_party/externals/libwebp/src/dec/io.c',
31 '../third_party/externals/libwebp/src/dec/layer.c', 31 '../third_party/externals/libwebp/src/dec/layer.c',
32 '../third_party/externals/libwebp/src/dec/quant.c', 32 '../third_party/externals/libwebp/src/dec/quant.c',
33 '../third_party/externals/libwebp/src/dec/tree.c', 33 '../third_party/externals/libwebp/src/dec/tree.c',
34 '../third_party/externals/libwebp/src/dec/vp8.c', 34 '../third_party/externals/libwebp/src/dec/vp8.c',
35 '../third_party/externals/libwebp/src/dec/vp8l.c', 35 '../third_party/externals/libwebp/src/dec/vp8l.c',
36 '../third_party/externals/libwebp/src/dec/webp.c', 36 '../third_party/externals/libwebp/src/dec/webp.c',
37 ], 37 ],
38 'cflags': [ '-w' ], 38 'cflags': [ '-w' ],
39 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
39 }, 40 },
40 { 41 {
41 'target_name': 'libwebp_demux', 42 'target_name': 'libwebp_demux',
42 'type': 'static_library', 43 'type': 'static_library',
43 'include_dirs': [ 44 'include_dirs': [
44 '../third_party/externals/libwebp', 45 '../third_party/externals/libwebp',
45 ], 46 ],
46 'sources': [ 47 'sources': [
47 '../third_party/externals/libwebp/src/demux/demux.c', 48 '../third_party/externals/libwebp/src/demux/demux.c',
48 ], 49 ],
49 'cflags': [ '-w' ], 50 'cflags': [ '-w' ],
51 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
50 }, 52 },
51 { 53 {
52 'target_name': 'libwebp_dsp', 54 'target_name': 'libwebp_dsp',
53 'type': 'static_library', 55 'type': 'static_library',
54 'include_dirs': [ 56 'include_dirs': [
55 '../third_party/externals/libwebp', 57 '../third_party/externals/libwebp',
56 ], 58 ],
57 'sources': [ 59 'sources': [
58 '../third_party/externals/libwebp/src/dsp/cpu.c', 60 '../third_party/externals/libwebp/src/dsp/cpu.c',
59 '../third_party/externals/libwebp/src/dsp/dec.c', 61 '../third_party/externals/libwebp/src/dsp/dec.c',
60 '../third_party/externals/libwebp/src/dsp/dec_sse2.c', 62 '../third_party/externals/libwebp/src/dsp/dec_sse2.c',
61 '../third_party/externals/libwebp/src/dsp/enc.c', 63 '../third_party/externals/libwebp/src/dsp/enc.c',
62 '../third_party/externals/libwebp/src/dsp/enc_sse2.c', 64 '../third_party/externals/libwebp/src/dsp/enc_sse2.c',
63 '../third_party/externals/libwebp/src/dsp/lossless.c', 65 '../third_party/externals/libwebp/src/dsp/lossless.c',
64 '../third_party/externals/libwebp/src/dsp/upsampling.c', 66 '../third_party/externals/libwebp/src/dsp/upsampling.c',
65 '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c', 67 '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c',
66 '../third_party/externals/libwebp/src/dsp/yuv.c', 68 '../third_party/externals/libwebp/src/dsp/yuv.c',
67 ], 69 ],
68 'cflags': [ '-w' ], 70 'cflags': [ '-w' ],
71 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
69 'conditions': [ 72 'conditions': [
70 ['skia_os == "android"', { 73 ['skia_os == "android"', {
71 'dependencies' : [ 74 'dependencies' : [
72 'android_deps.gyp:cpu_features', 75 'android_deps.gyp:cpu_features',
73 ], 76 ],
74 }], 77 }],
75 ], 78 ],
76 }, 79 },
77 { 80 {
78 'target_name': 'libwebp_dsp_neon', 81 'target_name': 'libwebp_dsp_neon',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 '../third_party/externals/libwebp/src/enc/layer.c', 119 '../third_party/externals/libwebp/src/enc/layer.c',
117 '../third_party/externals/libwebp/src/enc/picture.c', 120 '../third_party/externals/libwebp/src/enc/picture.c',
118 '../third_party/externals/libwebp/src/enc/quant.c', 121 '../third_party/externals/libwebp/src/enc/quant.c',
119 '../third_party/externals/libwebp/src/enc/syntax.c', 122 '../third_party/externals/libwebp/src/enc/syntax.c',
120 '../third_party/externals/libwebp/src/enc/token.c', 123 '../third_party/externals/libwebp/src/enc/token.c',
121 '../third_party/externals/libwebp/src/enc/tree.c', 124 '../third_party/externals/libwebp/src/enc/tree.c',
122 '../third_party/externals/libwebp/src/enc/vp8l.c', 125 '../third_party/externals/libwebp/src/enc/vp8l.c',
123 '../third_party/externals/libwebp/src/enc/webpenc.c', 126 '../third_party/externals/libwebp/src/enc/webpenc.c',
124 ], 127 ],
125 'cflags': [ '-w' ], 128 'cflags': [ '-w' ],
129 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
126 }, 130 },
127 { 131 {
128 'target_name': 'libwebp_utils', 132 'target_name': 'libwebp_utils',
129 'type': 'static_library', 133 'type': 'static_library',
130 'include_dirs': [ 134 'include_dirs': [
131 '../third_party/externals/libwebp', 135 '../third_party/externals/libwebp',
132 ], 136 ],
133 'sources': [ 137 'sources': [
134 '../third_party/externals/libwebp/src/utils/bit_reader.c', 138 '../third_party/externals/libwebp/src/utils/bit_reader.c',
135 '../third_party/externals/libwebp/src/utils/bit_writer.c', 139 '../third_party/externals/libwebp/src/utils/bit_writer.c',
136 '../third_party/externals/libwebp/src/utils/color_cache.c', 140 '../third_party/externals/libwebp/src/utils/color_cache.c',
137 '../third_party/externals/libwebp/src/utils/filters.c', 141 '../third_party/externals/libwebp/src/utils/filters.c',
138 '../third_party/externals/libwebp/src/utils/huffman.c', 142 '../third_party/externals/libwebp/src/utils/huffman.c',
139 '../third_party/externals/libwebp/src/utils/huffman_encode.c', 143 '../third_party/externals/libwebp/src/utils/huffman_encode.c',
140 '../third_party/externals/libwebp/src/utils/quant_levels.c', 144 '../third_party/externals/libwebp/src/utils/quant_levels.c',
141 '../third_party/externals/libwebp/src/utils/quant_levels_dec.c', 145 '../third_party/externals/libwebp/src/utils/quant_levels_dec.c',
142 '../third_party/externals/libwebp/src/utils/rescaler.c', 146 '../third_party/externals/libwebp/src/utils/rescaler.c',
143 '../third_party/externals/libwebp/src/utils/thread.c', 147 '../third_party/externals/libwebp/src/utils/thread.c',
144 '../third_party/externals/libwebp/src/utils/utils.c', 148 '../third_party/externals/libwebp/src/utils/utils.c',
145 ], 149 ],
146 'cflags': [ '-w' ], 150 'cflags': [ '-w' ],
151 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
147 }, 152 },
148 { 153 {
149 'target_name': 'libwebp', 154 'target_name': 'libwebp',
150 'type': 'none', 155 'type': 'none',
151 'dependencies' : [ 156 'dependencies' : [
152 'libwebp_dec', 157 'libwebp_dec',
153 'libwebp_demux', 158 'libwebp_demux',
154 'libwebp_dsp', 159 'libwebp_dsp',
155 'libwebp_dsp_neon', 160 'libwebp_dsp_neon',
156 'libwebp_enc', 161 'libwebp_enc',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 ], 203 ],
199 }, 204 },
200 }, 205 },
201 ], 206 ],
202 ], 207 ],
203 } 208 }
204 ], 209 ],
205 }], 210 }],
206 ], 211 ],
207 } 212 }
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