Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: gyp/common_variables.gypi

Issue 132333002: Fix Mac fontconfig build (try 2) (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: comments 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gyp/fontconfig.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 74e596cf193127be5dc6f73db59bcc3017cd0049..1c6111ac4a665e6cc87f3f7ce308bc3b8daa104b 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -57,6 +57,11 @@
}, {
'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,
}, {
@@ -146,6 +151,7 @@
'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 »

Powered by Google App Engine
This is Rietveld 408576698