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

Side by Side Diff: gyp/libwebp.gyp

Issue 1280073002: Update libwebp and resume testing scaled webp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update to a newer version of libwebp with another uninitialized fix Created 5 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
« no previous file with comments | « dm/DM.cpp ('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 '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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 'target_name': 'libwebp_dsp', 59 'target_name': 'libwebp_dsp',
60 'type': 'static_library', 60 'type': 'static_library',
61 'includes': [ 61 'includes': [
62 'libwebp_skia.gypi', 62 'libwebp_skia.gypi',
63 ], 63 ],
64 'include_dirs': [ 64 'include_dirs': [
65 '../third_party/externals/libwebp', 65 '../third_party/externals/libwebp',
66 ], 66 ],
67 'sources': [ 67 'sources': [
68 '../third_party/externals/libwebp/src/dsp/alpha_processing.c', 68 '../third_party/externals/libwebp/src/dsp/alpha_processing.c',
69 '../third_party/externals/libwebp/src/dsp/alpha_processing_mips_dsp_ r2.c',
69 '../third_party/externals/libwebp/src/dsp/alpha_processing_sse2.c', 70 '../third_party/externals/libwebp/src/dsp/alpha_processing_sse2.c',
71 '../third_party/externals/libwebp/src/dsp/alpha_processing_sse41.c',
70 '../third_party/externals/libwebp/src/dsp/cpu.c', 72 '../third_party/externals/libwebp/src/dsp/cpu.c',
71 '../third_party/externals/libwebp/src/dsp/dec.c', 73 '../third_party/externals/libwebp/src/dsp/dec.c',
72 '../third_party/externals/libwebp/src/dsp/dec_clip_tables.c', 74 '../third_party/externals/libwebp/src/dsp/dec_clip_tables.c',
75 '../third_party/externals/libwebp/src/dsp/dec_mips32.c',
76 '../third_party/externals/libwebp/src/dsp/dec_mips_dsp_r2.c',
73 '../third_party/externals/libwebp/src/dsp/dec_sse2.c', 77 '../third_party/externals/libwebp/src/dsp/dec_sse2.c',
78 '../third_party/externals/libwebp/src/dsp/dec_sse41.c',
74 '../third_party/externals/libwebp/src/dsp/enc.c', 79 '../third_party/externals/libwebp/src/dsp/enc.c',
75 '../third_party/externals/libwebp/src/dsp/enc_sse2.c', 80 '../third_party/externals/libwebp/src/dsp/enc_sse2.c',
81 '../third_party/externals/libwebp/src/dsp/filters.c',
82 '../third_party/externals/libwebp/src/dsp/filters_mips_dsp_r2.c',
83 '../third_party/externals/libwebp/src/dsp/filters_sse2.c',
76 '../third_party/externals/libwebp/src/dsp/lossless.c', 84 '../third_party/externals/libwebp/src/dsp/lossless.c',
85 '../third_party/externals/libwebp/src/dsp/lossless_mips_dsp_r2.c',
77 '../third_party/externals/libwebp/src/dsp/lossless_sse2.c', 86 '../third_party/externals/libwebp/src/dsp/lossless_sse2.c',
87 '../third_party/externals/libwebp/src/dsp/rescaler.c',
88 '../third_party/externals/libwebp/src/dsp/rescaler_mips32.c',
89 '../third_party/externals/libwebp/src/dsp/rescaler_mips_dsp_r2.c',
78 '../third_party/externals/libwebp/src/dsp/upsampling.c', 90 '../third_party/externals/libwebp/src/dsp/upsampling.c',
91 '../third_party/externals/libwebp/src/dsp/upsampling_mips_dsp_r2.c',
79 '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c', 92 '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c',
80 '../third_party/externals/libwebp/src/dsp/yuv.c', 93 '../third_party/externals/libwebp/src/dsp/yuv.c',
94 '../third_party/externals/libwebp/src/dsp/yuv_mips32.c',
95 '../third_party/externals/libwebp/src/dsp/yuv_mips_dsp_r2.c',
81 '../third_party/externals/libwebp/src/dsp/yuv_sse2.c', 96 '../third_party/externals/libwebp/src/dsp/yuv_sse2.c',
82 ], 97 ],
83 'cflags': [ '-w' ], 98 'cflags': [ '-w' ],
84 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] }, 99 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
85 'conditions': [ 100 'conditions': [
86 ['skia_os == "android"', { 101 ['skia_os == "android"', {
87 'dependencies' : [ 102 'dependencies' : [
88 'android_deps.gyp:cpu_features', 103 'android_deps.gyp:cpu_features',
89 ], 104 ],
90 }], 105 }],
(...skipping 10 matching lines...) Expand all
101 }], 116 }],
102 ['arm_version >= 7', { 117 ['arm_version >= 7', {
103 'type': 'static_library', 118 'type': 'static_library',
104 'include_dirs': [ 119 'include_dirs': [
105 '../third_party/externals/libwebp', 120 '../third_party/externals/libwebp',
106 ], 121 ],
107 'sources': [ 122 'sources': [
108 '../third_party/externals/libwebp/src/dsp/dec_neon.c', 123 '../third_party/externals/libwebp/src/dsp/dec_neon.c',
109 '../third_party/externals/libwebp/src/dsp/enc_neon.c', 124 '../third_party/externals/libwebp/src/dsp/enc_neon.c',
110 '../third_party/externals/libwebp/src/dsp/lossless_neon.c', 125 '../third_party/externals/libwebp/src/dsp/lossless_neon.c',
126 '../third_party/externals/libwebp/src/dsp/lossless_enc_neon.c',
111 '../third_party/externals/libwebp/src/dsp/upsampling_neon.c', 127 '../third_party/externals/libwebp/src/dsp/upsampling_neon.c',
112 ], 128 ],
113 # behavior similar dsp_neon.c.neon in an Android.mk 129 # behavior similar dsp_neon.c.neon in an Android.mk
114 'cflags!': [ 130 'cflags!': [
115 '-mfpu=vfpv3-d16', 131 '-mfpu=vfpv3-d16',
116 ], 132 ],
117 'cflags': [ '-w' ], 133 'cflags': [ '-w' ],
118 },{ # !(arm_version >= 7) 134 },{ # !(arm_version >= 7)
119 'type': 'none', 135 'type': 'none',
120 }], 136 }],
121 ], 137 ],
122 }, 138 },
123 { 139 {
140 'target_name': 'libwebp_dsp_enc',
141 'type': 'static_library',
142 'includes': [
143 'libwebp_skia.gypi',
144 ],
145 'include_dirs': [
146 '../third_party/externals/libwebp',
147 ],
148 'sources': [
149 '../third_party/externals/libwebp/src/dsp/argb.c',
150 '../third_party/externals/libwebp/src/dsp/argb_mips_dsp_r2.c',
151 '../third_party/externals/libwebp/src/dsp/argb_sse2.c',
152 '../third_party/externals/libwebp/src/dsp/cost.c',
153 '../third_party/externals/libwebp/src/dsp/cost_mips32.c',
154 '../third_party/externals/libwebp/src/dsp/cost_mips_dsp_r2.c',
155 '../third_party/externals/libwebp/src/dsp/cost_sse2.c',
156 '../third_party/externals/libwebp/src/dsp/enc_avx2.c',
157 '../third_party/externals/libwebp/src/dsp/enc_mips32.c',
158 '../third_party/externals/libwebp/src/dsp/enc_mips_dsp_r2.c',
159 '../third_party/externals/libwebp/src/dsp/enc_sse41.c',
160 '../third_party/externals/libwebp/src/dsp/lossless_enc.c',
161 '../third_party/externals/libwebp/src/dsp/lossless_enc_mips32.c',
162 '../third_party/externals/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c ',
163 '../third_party/externals/libwebp/src/dsp/lossless_enc_sse2.c',
164 '../third_party/externals/libwebp/src/dsp/lossless_enc_sse41.c',
165 ],
166 },
167 {
124 'target_name': 'libwebp_enc', 168 'target_name': 'libwebp_enc',
125 'type': 'static_library', 169 'type': 'static_library',
126 'includes': [ 170 'includes': [
127 'libwebp_skia.gypi', 171 'libwebp_skia.gypi',
128 ], 172 ],
129 'include_dirs': [ 173 'include_dirs': [
130 '../third_party/externals/libwebp', 174 '../third_party/externals/libwebp',
131 ], 175 ],
176 'dependencies' : [
177 'libwebp_dsp_enc',
178 ],
132 'sources': [ 179 'sources': [
133 '../third_party/externals/libwebp/src/enc/alpha.c', 180 '../third_party/externals/libwebp/src/enc/alpha.c',
134 '../third_party/externals/libwebp/src/enc/analysis.c', 181 '../third_party/externals/libwebp/src/enc/analysis.c',
135 '../third_party/externals/libwebp/src/enc/backward_references.c', 182 '../third_party/externals/libwebp/src/enc/backward_references.c',
136 '../third_party/externals/libwebp/src/enc/config.c', 183 '../third_party/externals/libwebp/src/enc/config.c',
137 '../third_party/externals/libwebp/src/enc/cost.c', 184 '../third_party/externals/libwebp/src/enc/cost.c',
138 '../third_party/externals/libwebp/src/enc/filter.c', 185 '../third_party/externals/libwebp/src/enc/filter.c',
139 '../third_party/externals/libwebp/src/enc/frame.c', 186 '../third_party/externals/libwebp/src/enc/frame.c',
140 '../third_party/externals/libwebp/src/enc/histogram.c', 187 '../third_party/externals/libwebp/src/enc/histogram.c',
141 '../third_party/externals/libwebp/src/enc/iterator.c', 188 '../third_party/externals/libwebp/src/enc/iterator.c',
189 '../third_party/externals/libwebp/src/enc/near_lossless.c',
142 '../third_party/externals/libwebp/src/enc/picture.c', 190 '../third_party/externals/libwebp/src/enc/picture.c',
143 '../third_party/externals/libwebp/src/enc/picture_csp.c', 191 '../third_party/externals/libwebp/src/enc/picture_csp.c',
192 '../third_party/externals/libwebp/src/enc/picture_psnr.c',
193 '../third_party/externals/libwebp/src/enc/picture_rescale.c',
194 '../third_party/externals/libwebp/src/enc/picture_tools.c',
144 '../third_party/externals/libwebp/src/enc/quant.c', 195 '../third_party/externals/libwebp/src/enc/quant.c',
145 '../third_party/externals/libwebp/src/enc/syntax.c', 196 '../third_party/externals/libwebp/src/enc/syntax.c',
146 '../third_party/externals/libwebp/src/enc/token.c', 197 '../third_party/externals/libwebp/src/enc/token.c',
147 '../third_party/externals/libwebp/src/enc/tree.c', 198 '../third_party/externals/libwebp/src/enc/tree.c',
148 '../third_party/externals/libwebp/src/enc/vp8l.c', 199 '../third_party/externals/libwebp/src/enc/vp8l.c',
149 '../third_party/externals/libwebp/src/enc/webpenc.c', 200 '../third_party/externals/libwebp/src/enc/webpenc.c',
150 ], 201 ],
151 'cflags': [ '-w' ], 202 'cflags': [ '-w' ],
152 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] }, 203 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
153 }, 204 },
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 ], 280 ],
230 }, 281 },
231 }, 282 },
232 ], 283 ],
233 ], 284 ],
234 } 285 }
235 ], 286 ],
236 }], 287 }],
237 ], 288 ],
238 } 289 }
OLDNEW
« no previous file with comments | « dm/DM.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698