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

Unified Diff: gyp/gm.gyp

Issue 113203003: Fix Mac fontconfig build (Closed) Base URL: https://skia.googlesource.com/skia.git@noembed
Patch Set: checkpoint Created 7 years 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
Index: gyp/gm.gyp
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index a543aca4db57dbb5bcd7e871b5e3d4516216569f..1b71840c25e11fa5bd3d0181205f4cd4b84f9ee5 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -73,7 +73,7 @@
'pdfviewer_lib.gyp:pdfviewer_lib',
],
}],
- ['skia_os in ["linux", "mac", "win"]', {
+ ['skia_os in ["linux", "win"] or (skia_os == "mac" and skia_mac_poppler)', {
epoger 2014/01/08 19:40:22 I think it would be clearer to use a single flag (
vandebo (ex-Chrome) 2014/01/08 21:24:15 Changed to skia_enable_popper and made that work a
epoger 2014/01/08 21:38:12 Why do we still need the list of operating systems
vandebo (ex-Chrome) 2014/01/08 22:08:18 Done.
'dependencies': [
'poppler.gyp:libpoppler-cpp-gpl',
],

Powered by Google App Engine
This is Rietveld 408576698