gyp/codec.gyp - Issue 1774503004: Update android_make to support both --gcc and --clang options.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gyp/codec.gyp

Issue 1774503004: Update android_make to support both --gcc and --clang options. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: remove comment Created 4 years, 9 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:

Index: gyp/codec.gyp

diff --git a/gyp/codec.gyp b/gyp/codec.gyp

index e96aaed9d5a5b9d04226298c506bc96724678b1d..e91a3e55fa732670013dbc401b560251572f54bc 100644

--- a/gyp/codec.gyp

+++ b/gyp/codec.gyp

@@ -22,9 +22,13 @@

'libpng.gyp:libpng',

'libwebp.gyp:libwebp',

- 'cflags':[

- # FIXME: This gets around a warning: "Argument might be clobbered by longjmp".

- '-Wno-clobbered -Wno-error',

+ 'conditions' : [

+ [ 'skia_clang_build == 0', {

+ 'cflags':[

+ # FIXME: This gets around a warning: "Argument might be clobbered by longjmp".

+ '-Wno-clobbered -Wno-error'',

+ ],

+ }],

'include_dirs': [

'../include/codec',

« no previous file with comments | « no previous file | gyp/common_conditions.gypi » ('j') | gyp/freetype.gyp » ('J')