skia/skia.gyp - Issue 10198027: enable android x86 build

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: skia/skia.gyp

Issue 10198027: enable android x86 build (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Created 8 years, 8 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: skia/skia.gyp

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

index 835d20e3b6bc56bf4f1caec97406a3628342d7b1..7b422ea3f312f3441c469b3aaa5701b3f341fa15 100644

--- a/skia/skia.gyp

+++ b/skia/skia.gyp

@@ -1098,8 +1098,12 @@

'../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',

'../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',

- 'dependencies': [

- 'skia_opts_ssse3',

+ 'conditions': [

+ [ 'OS != "android"', {

John Grabowski 2012/04/26 21:53:08 Add explicit comment this conditional is hit for x

+ 'dependencies': [

+ 'skia_opts_ssse3',

+ ],

+ }],

{ # arm