gyp/common_variables.gypi - Issue 164793002: Small fixes for auto generating Android.mk

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 164793002: Small fixes for auto generating Android.mk (Closed) Base URL: https://skia.googlesource.com/skia.git@skia_android_framework

Patch Set: Remove Android.mk 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/common_variables.gypi

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

index d02d465087444185acfe30acf570726efb103260..c3ec7d8ce6a9efb65d8490d2ed73d9d2e089f4e9 100644

--- a/gyp/common_variables.gypi

+++ b/gyp/common_variables.gypi

@@ -57,8 +57,10 @@

'conditions': [

[ 'skia_android_framework == 1', {

'skia_os%': 'android',

+ 'skia_chrome_utils%': 0,

}, {

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

+ 'skia_chrome_utils%': 1,

}],

[ 'skia_os == "win"', {

'os_posix%': 0,

@@ -99,7 +101,6 @@

'skia_resource_cache_mb_limit%': 0,

'skia_resource_cache_count_limit%': 0,

'skia_angle%': 0,

- 'skia_chrome_utils%': 1,

'skia_directwrite%': 0,

'skia_gpu%': 1,

'skia_osx_deployment_target%': '',

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