gyp/opts.gyp - Issue 154053002: Reland "Gyp file changes for the android framework."

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/opts.gyp

Issue 154053002: Reland "Gyp file changes for the android framework." (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Fix android build. 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:

Index: gyp/opts.gyp

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

index 83dfe14b049b86c28ba28bcb3d72b5743f571c97..9fe4023ea621f51b5e9870c0b696966a9f04f428 100644

--- a/gyp/opts.gyp

+++ b/gyp/opts.gyp

@@ -1,3 +1,4 @@

+# Gyp file for opts projects

{

'targets': [

# Due to an unfortunate intersection of lameness between gcc and gyp,

@@ -98,7 +99,9 @@

}],

- [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', {

+ [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \

+ or (skia_os == "ios") \

+ or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips"])', {

'sources': [

'../src/opts/SkBitmapProcState_opts_none.cpp',

'../src/opts/SkBlitMask_opts_none.cpp',

« no previous file with comments | « gyp/libwebp.gyp ('k') | gyp/pdf.gyp » ('j') | no next file with comments »