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

Side by Side Diff: gyp/libwebp.gyp

Issue 807553002: Roll libwebp to v0.4.2 (latest stable) to fix annoying build warning. (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 | « DEPS ('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 10 matching lines...) Expand all
21 'type': 'static_library', 21 'type': 'static_library',
22 'include_dirs': [ 22 'include_dirs': [
23 '../third_party/externals/libwebp', 23 '../third_party/externals/libwebp',
24 ], 24 ],
25 'sources': [ 25 'sources': [
26 '../third_party/externals/libwebp/src/dec/alpha.c', 26 '../third_party/externals/libwebp/src/dec/alpha.c',
27 '../third_party/externals/libwebp/src/dec/buffer.c', 27 '../third_party/externals/libwebp/src/dec/buffer.c',
28 '../third_party/externals/libwebp/src/dec/frame.c', 28 '../third_party/externals/libwebp/src/dec/frame.c',
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',
32 '../third_party/externals/libwebp/src/dec/quant.c', 31 '../third_party/externals/libwebp/src/dec/quant.c',
33 '../third_party/externals/libwebp/src/dec/tree.c', 32 '../third_party/externals/libwebp/src/dec/tree.c',
34 '../third_party/externals/libwebp/src/dec/vp8.c', 33 '../third_party/externals/libwebp/src/dec/vp8.c',
35 '../third_party/externals/libwebp/src/dec/vp8l.c', 34 '../third_party/externals/libwebp/src/dec/vp8l.c',
36 '../third_party/externals/libwebp/src/dec/webp.c', 35 '../third_party/externals/libwebp/src/dec/webp.c',
37 ], 36 ],
38 'cflags': [ '-w' ], 37 'cflags': [ '-w' ],
39 }, 38 },
40 { 39 {
41 'target_name': 'libwebp_demux', 40 'target_name': 'libwebp_demux',
42 'type': 'static_library', 41 'type': 'static_library',
43 'include_dirs': [ 42 'include_dirs': [
44 '../third_party/externals/libwebp', 43 '../third_party/externals/libwebp',
45 ], 44 ],
46 'sources': [ 45 'sources': [
47 '../third_party/externals/libwebp/src/demux/demux.c', 46 '../third_party/externals/libwebp/src/demux/demux.c',
48 ], 47 ],
49 'cflags': [ '-w' ], 48 'cflags': [ '-w' ],
50 }, 49 },
51 { 50 {
52 'target_name': 'libwebp_dsp', 51 'target_name': 'libwebp_dsp',
53 'type': 'static_library', 52 'type': 'static_library',
54 'include_dirs': [ 53 'include_dirs': [
55 '../third_party/externals/libwebp', 54 '../third_party/externals/libwebp',
56 ], 55 ],
57 'sources': [ 56 'sources': [
57 '../third_party/externals/libwebp/src/dsp/alpha_processing.c',
58 '../third_party/externals/libwebp/src/dsp/alpha_processing_sse2.c',
58 '../third_party/externals/libwebp/src/dsp/cpu.c', 59 '../third_party/externals/libwebp/src/dsp/cpu.c',
59 '../third_party/externals/libwebp/src/dsp/dec.c', 60 '../third_party/externals/libwebp/src/dsp/dec.c',
61 '../third_party/externals/libwebp/src/dsp/dec_clip_tables.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',
66 '../third_party/externals/libwebp/src/dsp/lossless_sse2.c',
64 '../third_party/externals/libwebp/src/dsp/upsampling.c', 67 '../third_party/externals/libwebp/src/dsp/upsampling.c',
65 '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c', 68 '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c',
66 '../third_party/externals/libwebp/src/dsp/yuv.c', 69 '../third_party/externals/libwebp/src/dsp/yuv.c',
70 '../third_party/externals/libwebp/src/dsp/yuv_sse2.c',
67 ], 71 ],
68 'cflags': [ '-w' ], 72 'cflags': [ '-w' ],
69 'conditions': [ 73 'conditions': [
70 ['skia_os == "android"', { 74 ['skia_os == "android"', {
71 'dependencies' : [ 75 'dependencies' : [
72 'android_deps.gyp:cpu_features', 76 'android_deps.gyp:cpu_features',
73 ], 77 ],
74 }], 78 }],
75 ], 79 ],
76 }, 80 },
77 { 81 {
78 'target_name': 'libwebp_dsp_neon', 82 'target_name': 'libwebp_dsp_neon',
79 'conditions': [ 83 'conditions': [
80 ['arm_version >= 7', { 84 ['arm_version >= 7', {
81 'type': 'static_library', 85 'type': 'static_library',
82 'include_dirs': [ 86 'include_dirs': [
83 '../third_party/externals/libwebp', 87 '../third_party/externals/libwebp',
84 ], 88 ],
85 'sources': [ 89 'sources': [
86 '../third_party/externals/libwebp/src/dsp/dec_neon.c', 90 '../third_party/externals/libwebp/src/dsp/dec_neon.c',
87 '../third_party/externals/libwebp/src/dsp/enc_neon.c', 91 '../third_party/externals/libwebp/src/dsp/enc_neon.c',
92 '../third_party/externals/libwebp/src/dsp/lossless_neon.c',
88 '../third_party/externals/libwebp/src/dsp/upsampling_neon.c', 93 '../third_party/externals/libwebp/src/dsp/upsampling_neon.c',
89 ], 94 ],
90 # behavior similar dsp_neon.c.neon in an Android.mk 95 # behavior similar dsp_neon.c.neon in an Android.mk
91 'cflags!': [ 96 'cflags!': [
92 '-mfpu=vfpv3-d16', 97 '-mfpu=vfpv3-d16',
93 ], 98 ],
94 'cflags': [ '-mfpu=neon', '-w' ], 99 'cflags': [ '-mfpu=neon', '-w' ],
95 },{ # !(arm_version >= 7) 100 },{ # !(arm_version >= 7)
96 'type': 'none', 101 'type': 'none',
97 }], 102 }],
98 ], 103 ],
99 }, 104 },
100 { 105 {
101 'target_name': 'libwebp_enc', 106 'target_name': 'libwebp_enc',
102 'type': 'static_library', 107 'type': 'static_library',
103 'include_dirs': [ 108 'include_dirs': [
104 '../third_party/externals/libwebp', 109 '../third_party/externals/libwebp',
105 ], 110 ],
106 'sources': [ 111 'sources': [
107 '../third_party/externals/libwebp/src/enc/alpha.c', 112 '../third_party/externals/libwebp/src/enc/alpha.c',
108 '../third_party/externals/libwebp/src/enc/analysis.c', 113 '../third_party/externals/libwebp/src/enc/analysis.c',
109 '../third_party/externals/libwebp/src/enc/backward_references.c', 114 '../third_party/externals/libwebp/src/enc/backward_references.c',
110 '../third_party/externals/libwebp/src/enc/config.c', 115 '../third_party/externals/libwebp/src/enc/config.c',
111 '../third_party/externals/libwebp/src/enc/cost.c', 116 '../third_party/externals/libwebp/src/enc/cost.c',
112 '../third_party/externals/libwebp/src/enc/filter.c', 117 '../third_party/externals/libwebp/src/enc/filter.c',
113 '../third_party/externals/libwebp/src/enc/frame.c', 118 '../third_party/externals/libwebp/src/enc/frame.c',
114 '../third_party/externals/libwebp/src/enc/histogram.c', 119 '../third_party/externals/libwebp/src/enc/histogram.c',
115 '../third_party/externals/libwebp/src/enc/iterator.c', 120 '../third_party/externals/libwebp/src/enc/iterator.c',
116 '../third_party/externals/libwebp/src/enc/layer.c',
117 '../third_party/externals/libwebp/src/enc/picture.c', 121 '../third_party/externals/libwebp/src/enc/picture.c',
122 '../third_party/externals/libwebp/src/enc/picture_csp.c',
123 '../third_party/externals/libwebp/src/enc/picture_psnr.c',
124 '../third_party/externals/libwebp/src/enc/picture_rescale.c',
125 '../third_party/externals/libwebp/src/enc/picture_tools.c',
118 '../third_party/externals/libwebp/src/enc/quant.c', 126 '../third_party/externals/libwebp/src/enc/quant.c',
119 '../third_party/externals/libwebp/src/enc/syntax.c', 127 '../third_party/externals/libwebp/src/enc/syntax.c',
120 '../third_party/externals/libwebp/src/enc/token.c', 128 '../third_party/externals/libwebp/src/enc/token.c',
121 '../third_party/externals/libwebp/src/enc/tree.c', 129 '../third_party/externals/libwebp/src/enc/tree.c',
122 '../third_party/externals/libwebp/src/enc/vp8l.c', 130 '../third_party/externals/libwebp/src/enc/vp8l.c',
123 '../third_party/externals/libwebp/src/enc/webpenc.c', 131 '../third_party/externals/libwebp/src/enc/webpenc.c',
124 ], 132 ],
125 'cflags': [ '-w' ], 133 'cflags': [ '-w' ],
126 }, 134 },
127 { 135 {
128 'target_name': 'libwebp_utils', 136 'target_name': 'libwebp_utils',
129 'type': 'static_library', 137 'type': 'static_library',
130 'include_dirs': [ 138 'include_dirs': [
131 '../third_party/externals/libwebp', 139 '../third_party/externals/libwebp',
132 ], 140 ],
133 'sources': [ 141 'sources': [
134 '../third_party/externals/libwebp/src/utils/bit_reader.c', 142 '../third_party/externals/libwebp/src/utils/bit_reader.c',
135 '../third_party/externals/libwebp/src/utils/bit_writer.c', 143 '../third_party/externals/libwebp/src/utils/bit_writer.c',
136 '../third_party/externals/libwebp/src/utils/color_cache.c', 144 '../third_party/externals/libwebp/src/utils/color_cache.c',
137 '../third_party/externals/libwebp/src/utils/filters.c', 145 '../third_party/externals/libwebp/src/utils/filters.c',
138 '../third_party/externals/libwebp/src/utils/huffman.c', 146 '../third_party/externals/libwebp/src/utils/huffman.c',
139 '../third_party/externals/libwebp/src/utils/huffman_encode.c', 147 '../third_party/externals/libwebp/src/utils/huffman_encode.c',
140 '../third_party/externals/libwebp/src/utils/quant_levels.c', 148 '../third_party/externals/libwebp/src/utils/quant_levels.c',
141 '../third_party/externals/libwebp/src/utils/quant_levels_dec.c', 149 '../third_party/externals/libwebp/src/utils/quant_levels_dec.c',
150 '../third_party/externals/libwebp/src/utils/random.c',
142 '../third_party/externals/libwebp/src/utils/rescaler.c', 151 '../third_party/externals/libwebp/src/utils/rescaler.c',
143 '../third_party/externals/libwebp/src/utils/thread.c', 152 '../third_party/externals/libwebp/src/utils/thread.c',
144 '../third_party/externals/libwebp/src/utils/utils.c', 153 '../third_party/externals/libwebp/src/utils/utils.c',
145 ], 154 ],
146 'cflags': [ '-w' ], 155 'cflags': [ '-w' ],
147 }, 156 },
148 { 157 {
149 'target_name': 'libwebp', 158 'target_name': 'libwebp',
150 'type': 'none', 159 'type': 'none',
151 'dependencies' : [ 160 'dependencies' : [
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 ], 207 ],
199 }, 208 },
200 }, 209 },
201 ], 210 ],
202 ], 211 ],
203 } 212 }
204 ], 213 ],
205 }], 214 }],
206 ], 215 ],
207 } 216 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698