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

Unified Diff: src/pdf/SkPDFFont.cpp

Issue 1561753002: In Google3 build, use SK_SFNTLY_SUBSETTER define to enable/disable sfntly. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 4 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 | « BUILD.public ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pdf/SkPDFFont.cpp
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 15b289db092baa93675b13bd08c197429b0dbb18..5c06bcc53249a5eee2f0c831877ace5bbf47043e 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -24,14 +24,13 @@
#include "SkTypes.h"
#include "SkUtils.h"
-#if defined (GOOGLE3)
- #if !defined (SK_BUILD_FOR_ANDROID) && !defined (SK_BUILD_FOR_IOS)
+#if defined (SK_SFNTLY_SUBSETTER)
+ #if defined (GOOGLE3)
// #including #defines doesn't work with this build system.
#include "typography/font/sfntly/src/sample/chromium/font_subsetter.h"
- #define SK_SFNTLY_SUBSETTER // For the benefit of #ifdefs below.
+ #else
+ #include SK_SFNTLY_SUBSETTER
#endif
-#elif defined (SK_SFNTLY_SUBSETTER)
- #include SK_SFNTLY_SUBSETTER
#endif
// PDF's notion of symbolic vs non-symbolic is related to the character set, not
« no previous file with comments | « BUILD.public ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698