diff options
| author | caryclark <caryclark@google.com> | 2016-07-21 06:12:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-07-21 06:12:33 -0700 |
| commit | 8b301624917aae9f7b7b26e6d275c9ae9cd80cfe (patch) | |
| tree | 669bf4613c6f13f1b495159bbb449899f75aad3d /skia | |
| parent | 3b6c7e9669df2545fc3b19d9f03364c1040a5ab0 (diff) | |
| download | pdfium-8b301624917aae9f7b7b26e6d275c9ae9cd80cfe.tar.xz | |
Bring pdfium file in sync with chrome, fix mac build
This permits PDFium to build on the Mac with Skia as the backend. It builds on Linux and Windows as well.
R=dsinclair@chromium.org,bungeman@google.com
Review-Url: https://codereview.chromium.org/1995003002
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 6 | ||||
| -rw-r--r-- | skia/skia_gn_files.gypi | 1 | ||||
| -rw-r--r-- | skia/skia_library.gypi | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index c5c2796f9c..01acf58dcf 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -330,11 +330,7 @@ component("skia") { "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", ] } - if (!is_mac) { - sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] - } - - if (!is_linux && !is_android && !is_win) { + if (!is_linux && !is_android && !is_win && !is_mac) { sources -= [ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi index 062460b1c6..a3aca21014 100644 --- a/skia/skia_gn_files.gypi +++ b/skia/skia_gn_files.gypi @@ -9,7 +9,6 @@ '<(skia_src_path)/fonts/SkRemotableFontMgr.cpp', '<(skia_src_path)/ports/SkFontHost_FreeType_common.cpp', '<(skia_src_path)/ports/SkFontHost_FreeType.cpp', - '<(skia_src_path)/ports/SkFontHost_mac.cpp', '<(skia_src_path)/ports/SkFontHost_win.cpp', '<(skia_src_path)/ports/SkFontMgr_android.cpp', '<(skia_src_path)/ports/SkFontMgr_android_factory.cpp', diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 5757be226c..e933732410 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -41,7 +41,6 @@ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', - '../third_party/skia/src/ports/SkFontHost_mac.cpp', '../third_party/skia/src/ports/SkFontHost_win.cpp', "../third_party/skia/src/ports/SkFontMgr_android.cpp", "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp", |