commit e59cb1c1f1ab8f0a610889f4de9b3f20e174a94d
author halcanary <halcanary@google.com> Wed Aug 24 14:42:08 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 24 14:42:08 2016 -0700
tree 79dbcb289596c49c994d66aa9c9db77c9b41f397
parent 168261287136b3e26d079f3b6383f9dd5a975069

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

diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index a05462c..2619724 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