gyp/common_conditions.gypi - Issue 308143008: Change #def to be opt-out

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

Issue 308143008: Change #def to be opt-out (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Remove old define Created 6 years, 7 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_conditions.gypi

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

index 6dcdca884d4e9b35889c986e0d1ee42d828620a9..4a02bceef2bc55688e92489dbf32c1a5c09002a0 100644

--- a/gyp/common_conditions.gypi

+++ b/gyp/common_conditions.gypi

@@ -5,8 +5,7 @@

'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',

'SK_SUPPORT_GPU=<(skia_gpu)',

'SK_SUPPORT_OPENCL=<(skia_opencl)',

robertphillips 2014/06/02 19:57:24 need , !?

krajcevski 2014/06/02 20:19:34 Done.

- 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',

- 'SK_SUPPORT_ETC1'

+ 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)'

'conditions' : [

[ 'skia_arch_type == "arm64"', {

@@ -320,6 +319,7 @@

'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',

'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',

'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',

+ 'SK_IGNORE_ETC1_SUPPORT',

# Defines from skia_for_android_framework_defines.gypi

'<@(skia_for_android_framework_defines)',

« no previous file with comments | « no previous file | gyp/skia_for_chromium_defines.gypi » ('j') | no next file with comments »