diff options
| author | Dominik Röttsches <drott@chromium.org> | 2017-03-30 11:07:43 +0300 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-30 08:45:37 +0000 |
| commit | 4b0671ab3e795bbb5e6aaf6305cae3171d73d241 (patch) | |
| tree | 494c9d053197c1902fd9a4073d75b010b635b7a5 /third_party | |
| parent | 1831ca9439ece65b54bb2bcdaec777729689b9f9 (diff) | |
| download | pdfium-4b0671ab3e795bbb5e6aaf6305cae3171d73d241.tar.xz | |
Allow configuration of external embedder FreeType
Add a public config to fxfreetype to make includes visible and provide a
freetype_common group as a public dependency on fxcrt. freetype_common
switches between fxfreetype and //build/config/freetype, which gives
embedders the flexibility to configure the source of FreeType.
BUG=chromium:700926
Change-Id: I73ae26979dcf69a419485def23c7a13dffa2a15d
Reviewed-on: https://pdfium-review.googlesource.com/2971
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/BUILD.gn | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 2055821f8e..a24e99e7f0 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -46,12 +46,19 @@ config("fx_freetype_warnings") { # # ttgload.c casts from unsigned int to unsigned long to void*. cflags = [ - "-Wno-unused-function", - "-Wno-int-to-void-pointer-cast", + "-Wno-unused-function", + "-Wno-int-to-void-pointer-cast", ] } } +config("freetype_public_includes_config") { + include_dirs = [ + "freetype/include", + "freetype/src/include", + ] +} + # Tests may link against this even if the production library doesn't, # so it needs to be separate from it. static_library("fx_freetype") { @@ -63,6 +70,9 @@ static_library("fx_freetype") { # Must be after no_chromium_code for warning flags to be ordered correctly. ":fx_freetype_warnings", ] + + public_configs = [ ":freetype_public_includes_config" ] + defines = [ "FT2_BUILD_LIBRARY" ] sources = [ "freetype/include/freetype/config/ftconfig.h", |