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

Side by Side Diff: gyp/libwebp.gyp

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