Upstream support for sfntly in Google3

See cr/86110021.

BUG=skia:

Review URL: https://codereview.chromium.org/913143007

diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 3b35b56..426fbaf 100644 (file)
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -26,7 +26,13 @@
 #include "SkUtils.h"
 
 #if defined (SK_SFNTLY_SUBSETTER)
-#include SK_SFNTLY_SUBSETTER
+    #include SK_SFNTLY_SUBSETTER
+#endif
+
+#if defined (GOOGLE3)
+    // #including #defines doesn't work in with this build system.
+    #include "typography/font/sfntly/src/sample/chromium/font_subsetter.h"
+    #define SK_SFNTLY_SUBSETTER  // For the benefit of #ifdefs below.
 #endif
 
 // PDF's notion of symbolic vs non-symbolic is related to the character set, not