From e59cb1c1f1ab8f0a610889f4de9b3f20e174a94d Mon Sep 17 00:00:00 2001 From: halcanary Date: Wed, 24 Aug 2016 14:42:08 -0700 Subject: [PATCH] SkPDF: set SK_SFNTLY_SUBSETTER uniformly When Skia is built into the Android framework, SK_SFNTLY_SUBSETTER="sample/chromium/font_subsetter.h". This #includes the same value for GOOGLE3. Once Chrome is also using this value, we can do away with the `#ifdef GOOGLE3` line. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2272103002 Review-Url: https://codereview.chromium.org/2272103002 --- src/pdf/SkPDFFont.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp index a05462c4fb..2619724cbb 100644 --- a/src/pdf/SkPDFFont.cpp +++ b/src/pdf/SkPDFFont.cpp @@ -25,7 +25,7 @@ #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" + #include "sample/chromium/font_subsetter.h" #else #include SK_SFNTLY_SUBSETTER #endif -- 2.34.1