gyp/common_variables.gypi - Issue 801413002: fix last warnings on w64 and turn on w.a.e.

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/common_variables.gypi

Issue 801413002: fix last warnings on w64 and turn on w.a.e. (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:

Index: gyp/common_variables.gypi

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi

index 09d84ec39968cdcff37cef21c910d5a7d6c62de0..a6220e0a910c3b59ed39858c2272f8f265165e2f 100644

--- a/gyp/common_variables.gypi

+++ b/gyp/common_variables.gypi

@@ -161,7 +161,7 @@

'conditions': [

- [ 'skia_os == "win" and skia_arch_width == 32 or '

+ [ 'skia_os == "win" or '

'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"] '

mtklein 2014/12/15 16:51:41 Might want to put "win" in the list with the other

bsalomon 2014/12/15 16:54:12 oh, yeah, duh.

'and skia_android_framework == 0 or '

'skia_os == "mac" and skia_arch_width == 32', {