diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2015-02-02 16:52:07 -0800 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2015-02-02 16:52:07 -0800 |
| commit | ef4dce44bb4b990f301a98853075f501c6f053d7 (patch) | |
| tree | 006cd513695df7d324fce1fd1b4a58af3902d799 /third_party | |
| parent | 3795a748bb3fb7fc3f2c6196af1f89627ac37f4e (diff) | |
| download | pdfium-ef4dce44bb4b990f301a98853075f501c6f053d7.tar.xz | |
Merge the following changes to XFA branch:
b3a788e Fix GN PDFium build when building all. by John Abd-El-Malek - 19 hours ago chromium/2293
f8af677 Always use the FreeType headers included in PDFium. by John Abd-El-Malek - 24 hours ago
dc8c950 Don't export any OpenJPEG methods from PDFium. by John Abd-El-Malek - 3 days ago
71c24b8 Use system FreeType on Linux. by John Abd-El-Malek - 3 days ago
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/900433002
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/BUILD.gn | 1 |
1 files changed, 1 insertions, 0 deletions
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", |