diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2015-02-01 16:19:29 -0800 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2015-02-01 16:19:29 -0800 |
| commit | b3a788e5e37955620b26be5b6e3048d37b605e00 (patch) | |
| tree | 6735c7d573ec1259485ecadaf159d0af59a9f4b5 | |
| parent | f8af67788cbe2f4b4f40a707e6cdc29a1a2187fb (diff) | |
| download | pdfium-chromium/2294.tar.xz | |
Fix GN PDFium build when building all.chromium/2294chromium/2293
The problem was FT_INTERNAL_DEBUG_H wasn't being defined because FT2_BUILD_LIBRARY wasn't set. So even if PDFium isn't using bundled FreeType, the FreeType target needs FT2_BUILD_LIBRARY defined. The GYP build was already correct.
BUG=453844
TBR=brettw
Review URL: https://codereview.chromium.org/891993003
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | pdfium.gyp | 5 | ||||
| -rw-r--r-- | third_party/BUILD.gn | 1 |
3 files changed, 1 insertions, 9 deletions
@@ -43,10 +43,6 @@ config("pdfium_config") { "/wd4345", ] } - - if (bundle_freetype) { - defines += [ "FT2_BUILD_LIBRARY" ] - } } static_library("pdfium") { diff --git a/pdfium.gyp b/pdfium.gyp index 2b21e9d9aa..7b6ac0c094 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -23,11 +23,6 @@ ['pdf_use_skia==1', { 'defines': ['_SKIA_SUPPORT_'], }], - ['bundle_freetype==1', { - 'defines' : [ - 'FT2_BUILD_LIBRARY', - ], - }], ['OS=="linux"', { 'conditions': [ ['target_arch=="x64"', { diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index e6340c6401..df02938a93 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -36,6 +36,7 @@ static_library("freetype") { "//third_party/pdfium:pdfium_config", "//build/config/compiler:no_chromium_code", ] + defines = [ "FT2_BUILD_LIBRARY" ] sources = [ "freetype/include/freetype.h", "freetype/include/ft2build.h", |