gyp/common.gypi - Issue 198063002: Updates to Android.mk generation.

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

Issue 198063002: Updates to Android.mk generation. (Closed) Base URL: https://skia.googlesource.com/skia.git@android_mk

Patch Set: Rebase Created 6 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/common.gypi

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

index 2a5bbd493e216bdd6009e8c58857076c3265a8d7..fe268c47a9c4e2f1cc5382a503440d3e19dc29a7 100644

--- a/gyp/common.gypi

+++ b/gyp/common.gypi

@@ -88,7 +88,11 @@

- [ 'skia_android_framework==0', {

+ [ 'skia_android_framework', {

+ 'defines!': [

+ 'SK_SCALAR_TO_FLOAT_EXCLUDED',

+ ],

+ }, {

# These defines are not used for skia_android_framework, where we build

# one makefile and allow someone to add SK_DEBUG etc for their own

# debugging purposes.