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

Side by Side Diff: gyp/libwebp.gyp

Issue 175383002: Fix warnings on Ubuntu13 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Respond to comments. Created 6 years, 10 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 | « gyp/libjpeg.gyp ('k') | src/animator/SkDisplayType.cpp » ('j') | 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 'conditions':[ 7 'conditions':[
8 ['skia_android_framework == 1', { 8 ['skia_android_framework == 1', {
9 'use_system_libwebp': 1, 9 'use_system_libwebp': 1,
10 }, { 10 }, {
(...skipping 16 matching lines...) Expand all
27 '../third_party/externals/libwebp/src/dec/frame.c', 27 '../third_party/externals/libwebp/src/dec/frame.c',
28 '../third_party/externals/libwebp/src/dec/idec.c', 28 '../third_party/externals/libwebp/src/dec/idec.c',
29 '../third_party/externals/libwebp/src/dec/io.c', 29 '../third_party/externals/libwebp/src/dec/io.c',
30 '../third_party/externals/libwebp/src/dec/layer.c', 30 '../third_party/externals/libwebp/src/dec/layer.c',
31 '../third_party/externals/libwebp/src/dec/quant.c', 31 '../third_party/externals/libwebp/src/dec/quant.c',
32 '../third_party/externals/libwebp/src/dec/tree.c', 32 '../third_party/externals/libwebp/src/dec/tree.c',
33 '../third_party/externals/libwebp/src/dec/vp8.c', 33 '../third_party/externals/libwebp/src/dec/vp8.c',
34 '../third_party/externals/libwebp/src/dec/vp8l.c', 34 '../third_party/externals/libwebp/src/dec/vp8l.c',
35 '../third_party/externals/libwebp/src/dec/webp.c', 35 '../third_party/externals/libwebp/src/dec/webp.c',
36 ], 36 ],
37 'cflags': [ '-w' ],
37 }, 38 },
38 { 39 {
39 'target_name': 'libwebp_demux', 40 'target_name': 'libwebp_demux',
40 'type': 'static_library', 41 'type': 'static_library',
41 'include_dirs': [ 42 'include_dirs': [
42 '../third_party/externals/libwebp', 43 '../third_party/externals/libwebp',
43 ], 44 ],
44 'sources': [ 45 'sources': [
45 '../third_party/externals/libwebp/src/demux/demux.c', 46 '../third_party/externals/libwebp/src/demux/demux.c',
46 ], 47 ],
48 'cflags': [ '-w' ],
47 }, 49 },
48 { 50 {
49 'target_name': 'libwebp_dsp', 51 'target_name': 'libwebp_dsp',
50 'type': 'static_library', 52 'type': 'static_library',
51 'include_dirs': [ 53 'include_dirs': [
52 '../third_party/externals/libwebp', 54 '../third_party/externals/libwebp',
53 ], 55 ],
54 'sources': [ 56 'sources': [
55 '../third_party/externals/libwebp/src/dsp/cpu.c', 57 '../third_party/externals/libwebp/src/dsp/cpu.c',
56 '../third_party/externals/libwebp/src/dsp/dec.c', 58 '../third_party/externals/libwebp/src/dsp/dec.c',
57 '../third_party/externals/libwebp/src/dsp/dec_sse2.c', 59 '../third_party/externals/libwebp/src/dsp/dec_sse2.c',
58 '../third_party/externals/libwebp/src/dsp/enc.c', 60 '../third_party/externals/libwebp/src/dsp/enc.c',
59 '../third_party/externals/libwebp/src/dsp/enc_sse2.c', 61 '../third_party/externals/libwebp/src/dsp/enc_sse2.c',
60 '../third_party/externals/libwebp/src/dsp/lossless.c', 62 '../third_party/externals/libwebp/src/dsp/lossless.c',
61 '../third_party/externals/libwebp/src/dsp/upsampling.c', 63 '../third_party/externals/libwebp/src/dsp/upsampling.c',
62 '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c', 64 '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c',
63 '../third_party/externals/libwebp/src/dsp/yuv.c', 65 '../third_party/externals/libwebp/src/dsp/yuv.c',
64 ], 66 ],
67 'cflags': [ '-w' ],
65 'conditions': [ 68 'conditions': [
66 ['skia_os == "android"', { 69 ['skia_os == "android"', {
67 'dependencies' : [ 70 'dependencies' : [
68 'android_deps.gyp:cpu_features', 71 'android_deps.gyp:cpu_features',
69 ], 72 ],
70 }], 73 }],
71 ], 74 ],
72 }, 75 },
73 { 76 {
74 'target_name': 'libwebp_dsp_neon', 77 'target_name': 'libwebp_dsp_neon',
75 'conditions': [ 78 'conditions': [
76 ['arm_version >= 7', { 79 ['arm_version >= 7', {
77 'type': 'static_library', 80 'type': 'static_library',
78 'include_dirs': [ 81 'include_dirs': [
79 '../third_party/externals/libwebp', 82 '../third_party/externals/libwebp',
80 ], 83 ],
81 'sources': [ 84 'sources': [
82 '../third_party/externals/libwebp/src/dsp/dec_neon.c', 85 '../third_party/externals/libwebp/src/dsp/dec_neon.c',
83 '../third_party/externals/libwebp/src/dsp/enc_neon.c', 86 '../third_party/externals/libwebp/src/dsp/enc_neon.c',
84 '../third_party/externals/libwebp/src/dsp/upsampling_neon.c', 87 '../third_party/externals/libwebp/src/dsp/upsampling_neon.c',
85 ], 88 ],
86 # behavior similar dsp_neon.c.neon in an Android.mk 89 # behavior similar dsp_neon.c.neon in an Android.mk
87 'cflags!': [ 90 'cflags!': [
88 '-mfpu=vfpv3-d16', 91 '-mfpu=vfpv3-d16',
89 ], 92 ],
90 'cflags': [ '-mfpu=neon' ], 93 'cflags': [ '-mfpu=neon', '-w' ],
91 },{ # !(arm_version >= 7) 94 },{ # !(arm_version >= 7)
92 'type': 'none', 95 'type': 'none',
93 }], 96 }],
94 ], 97 ],
95 }, 98 },
96 { 99 {
97 'target_name': 'libwebp_enc', 100 'target_name': 'libwebp_enc',
98 'type': 'static_library', 101 'type': 'static_library',
99 'include_dirs': [ 102 'include_dirs': [
100 '../third_party/externals/libwebp', 103 '../third_party/externals/libwebp',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 '../third_party/externals/libwebp/src/utils/color_cache.c', 135 '../third_party/externals/libwebp/src/utils/color_cache.c',
133 '../third_party/externals/libwebp/src/utils/filters.c', 136 '../third_party/externals/libwebp/src/utils/filters.c',
134 '../third_party/externals/libwebp/src/utils/huffman.c', 137 '../third_party/externals/libwebp/src/utils/huffman.c',
135 '../third_party/externals/libwebp/src/utils/huffman_encode.c', 138 '../third_party/externals/libwebp/src/utils/huffman_encode.c',
136 '../third_party/externals/libwebp/src/utils/quant_levels.c', 139 '../third_party/externals/libwebp/src/utils/quant_levels.c',
137 '../third_party/externals/libwebp/src/utils/quant_levels_dec.c', 140 '../third_party/externals/libwebp/src/utils/quant_levels_dec.c',
138 '../third_party/externals/libwebp/src/utils/rescaler.c', 141 '../third_party/externals/libwebp/src/utils/rescaler.c',
139 '../third_party/externals/libwebp/src/utils/thread.c', 142 '../third_party/externals/libwebp/src/utils/thread.c',
140 '../third_party/externals/libwebp/src/utils/utils.c', 143 '../third_party/externals/libwebp/src/utils/utils.c',
141 ], 144 ],
145 'cflags': [ '-w' ],
142 }, 146 },
143 { 147 {
144 'target_name': 'libwebp', 148 'target_name': 'libwebp',
145 'type': 'none', 149 'type': 'none',
146 'dependencies' : [ 150 'dependencies' : [
147 'libwebp_dec', 151 'libwebp_dec',
148 'libwebp_demux', 152 'libwebp_demux',
149 'libwebp_dsp', 153 'libwebp_dsp',
150 'libwebp_dsp_neon', 154 'libwebp_dsp_neon',
151 'libwebp_enc', 155 'libwebp_enc',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 ], 194 ],
191 }, 195 },
192 }, 196 },
193 ], 197 ],
194 ], 198 ],
195 } 199 }
196 ], 200 ],
197 }], 201 }],
198 ], 202 ],
199 } 203 }
OLDNEW
« no previous file with comments | « gyp/libjpeg.gyp ('k') | src/animator/SkDisplayType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698