gyp/common_variables.gypi - Issue 1243383002: Add skia_use_android_framework_defines GYP_DEFINE

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

Issue 1243383002: Add skia_use_android_framework_defines GYP_DEFINE (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Address comments Created 5 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/common_variables.gypi

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

index 10b465ac8eb6f4cc7aa926fa71b2450f69fd2e9b..911a3a5e89431a8b84bf0a266013c725b168bae2 100644

--- a/gyp/common_variables.gypi

+++ b/gyp/common_variables.gypi

@@ -76,10 +76,12 @@

[ 'skia_android_framework == 1', {

'skia_os%': 'android',

'skia_chrome_utils%': 0,

+ 'skia_use_android_framework_defines%': 1,

'skia_use_system_json%': 1,

}, {

'skia_os%': '<(skia_os)',

'skia_chrome_utils%': 1,

+ 'skia_use_android_framework_defines%': 0,

'skia_use_system_json%': 0,

}],

[ 'skia_os == "win"', {

@@ -197,6 +199,7 @@

'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)',

'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',

'skia_android_framework%': '<(skia_android_framework)',

+ 'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines)',

'skia_use_system_json%': '<(skia_use_system_json)',

'skia_android_path_rendering%': '<(skia_android_path_rendering)',

'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',

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