gyp/common_variables.gypi - Issue 132093003: Revert of Fix Mac fontconfig build

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 132093003: Revert of Fix Mac fontconfig build (Closed) Base URL: https://skia.googlesource.com/skia.git@noembed

Patch Set: Created 6 years, 11 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 1c6111ac4a665e6cc87f3f7ce308bc3b8daa104b..74e596cf193127be5dc6f73db59bcc3017cd0049 100644

--- a/gyp/common_variables.gypi

+++ b/gyp/common_variables.gypi

@@ -56,11 +56,6 @@

'os_posix%': 0,

}, {

'os_posix%': 1,

- }],

- [ 'skia_os in ["linux", "win", "mac"]', {

- 'skia_poppler_enabled%': 1,

- }, {

- 'skia_poppler_enabled%': 0,

}],

[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {

'skia_arch_width%': 64,

@@ -151,7 +146,6 @@

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

'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',

'skia_angle%': '<(skia_angle)',

- 'skia_poppler_enabled%': '<(skia_poppler_enabled)',

'skia_arch_width%': '<(skia_arch_width)',

'skia_arch_type%': '<(skia_arch_type)',

'skia_chrome_utils%': '<(skia_chrome_utils)',

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