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

Side by Side Diff: third_party/libwebp/libwebp.gyp

Issue 2001523002: GYP changes for arm64 linux build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporating review comments related to libwebp changes Created 4 years, 6 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
« build/common.gypi ('K') | « third_party/libwebp/README.chromium ('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 'target_defaults': { 6 'target_defaults': {
7 'conditions': [ 7 'conditions': [
8 ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', { 8 ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', {
9 'cflags!': [ '-Os' ], 9 'cflags!': [ '-Os' ],
10 'cflags': [ '-O2' ], 10 'cflags': [ '-O2' ],
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 'dsp/lossless_neon.c', 174 'dsp/lossless_neon.c',
175 'dsp/rescaler_neon.c', 175 'dsp/rescaler_neon.c',
176 'dsp/upsampling_neon.c', 176 'dsp/upsampling_neon.c',
177 ], 177 ],
178 'conditions': [ 178 'conditions': [
179 ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or ar m_neon_optional == 1)', { 179 ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or ar m_neon_optional == 1)', {
180 # behavior similar to *.c.neon in an Android.mk 180 # behavior similar to *.c.neon in an Android.mk
181 'cflags!': [ '-mfpu=vfpv3-d16' ], 181 'cflags!': [ '-mfpu=vfpv3-d16' ],
182 'cflags': [ '-mfpu=neon' ], 182 'cflags': [ '-mfpu=neon' ],
183 }], 183 }],
184 ['target_arch == "arm64"', { 184 ['target_arch == "arm64" and not (OS == "linux" and clang == 1)', {
Nico 2016/06/02 17:57:24 I think you can just add `and clang!=1` here. You
apatole 2016/06/03 06:11:47 OK, will do.
apatole 2016/06/03 11:33:44 Done.
185 # avoid an ICE with gcc-4.9: b/15574841 185 # avoid an ICE with gcc-4.9: b/15574841
186 # Disable it for clang build of linux arm64 as it fails with error - unsupported flag.
186 'cflags': [ '-frename-registers' ], 187 'cflags': [ '-frename-registers' ],
187 }], 188 }],
188 ] 189 ]
189 }, { 190 }, {
190 'type': 'none', 191 'type': 'none',
191 }], 192 }],
192 ], 193 ],
193 }, 194 },
194 { 195 {
195 'target_name': 'libwebp_enc', 196 'target_name': 'libwebp_enc',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 ], 262 ],
262 'direct_dependent_settings': { 263 'direct_dependent_settings': {
263 'include_dirs': ['.'], 264 'include_dirs': ['.'],
264 }, 265 },
265 'conditions': [ 266 'conditions': [
266 ['OS!="win"', {'product_name': 'webp'}], 267 ['OS!="win"', {'product_name': 'webp'}],
267 ], 268 ],
268 }, 269 },
269 ], 270 ],
270 } 271 }
OLDNEW
« build/common.gypi ('K') | « third_party/libwebp/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698