gyp/core.gyp - Issue 21096005: update gyp for ARM builds to be more well defined.

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

Issue 21096005: update gyp for ARM builds to be more well defined. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: rebase Created 7 years, 5 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/core.gyp

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

index 28f511166e1b3ad2fe506959b18c5be07c19fed3..14eda4bd3ce42f916c035df9cbe34ccf61ca4afd 100644

--- a/gyp/core.gyp

+++ b/gyp/core.gyp

@@ -80,7 +80,7 @@

'../src/core/SkPaintOptionsAndroid.cpp',

}],

- [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {

+ [ 'skia_os == "android" and skia_arch_type == "arm"', {

# The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.

'sources': [

'../src/core/SkPaintOptionsAndroid.cpp',