| Index: third_party/freetype2/BUILD.gn
|
| diff --git a/third_party/freetype2/BUILD.gn b/third_party/freetype2/BUILD.gn
|
| index 9208f3fb3e25fe6cab6cfd2438c8ce1f0a3a6eaf..f2ed5ed5e02ce87b6a6e8ec535bd2555aead17df 100644
|
| --- a/third_party/freetype2/BUILD.gn
|
| +++ b/third_party/freetype2/BUILD.gn
|
| @@ -23,6 +23,7 @@ shared_library("freetype2") {
|
| "src/src/base/ftbitmap.c",
|
| "src/src/base/ftcid.c",
|
| "src/src/base/ftdebug.c",
|
| + "src/src/base/ftfntfmt.c",
|
| "src/src/base/ftfstype.c",
|
| "src/src/base/ftgasp.c",
|
| "src/src/base/ftglyph.c",
|
| @@ -30,20 +31,14 @@ shared_library("freetype2") {
|
| "src/src/base/ftinit.c",
|
| "src/src/base/ftlcdfil.c",
|
| "src/src/base/ftmm.c",
|
| - "src/src/base/ftpfr.c",
|
| "src/src/base/ftstroke.c",
|
| "src/src/base/ftsynth.c",
|
| "src/src/base/ftsystem.c",
|
| "src/src/base/fttype1.c",
|
| - "src/src/base/ftwinfnt.c",
|
| - "src/src/base/ftxf86.c",
|
| "src/src/bdf/bdf.c",
|
| "src/src/cff/cff.c",
|
| - "src/src/cid/type1cid.c",
|
| "src/src/gzip/ftgzip.c",
|
| "src/src/lzw/ftlzw.c",
|
| - "src/src/pcf/pcf.c",
|
| - "src/src/pfr/pfr.c",
|
| "src/src/psaux/psaux.c",
|
| "src/src/pshinter/pshinter.c",
|
| "src/src/psnames/psnames.c",
|
| @@ -52,12 +47,14 @@ shared_library("freetype2") {
|
| "src/src/smooth/smooth.c",
|
| "src/src/truetype/truetype.c",
|
| "src/src/type1/type1.c",
|
| - "src/src/type42/type42.c",
|
| - "src/src/winfonts/winfnt.c",
|
| ]
|
|
|
| defines = [
|
| "FT_CONFIG_OPTION_SYSTEM_ZLIB",
|
| +
|
| + # TODO: Enable this option and figure out a way to address the cyclic
|
| + # dependency with HarfBuzz. crbug.com/617168
|
| + # "FT_CONFIG_OPTION_USE_HARFBUZZ",
|
| "FT2_BUILD_LIBRARY",
|
| "FT_CONFIG_CONFIG_H=<ftconfig.h>", # See comments in README.chromium.
|
| "FT_CONFIG_MODULES_H=<ftmodule.h>", # See comments in README.chromium.
|
| @@ -69,10 +66,9 @@ shared_library("freetype2") {
|
|
|
| public_configs = [ ":freetype2_config" ]
|
|
|
| - libs = [ "z" ]
|
| -
|
| deps = [
|
| "//build/config/sanitizers:deps",
|
| + "//third_party/libpng",
|
| "//third_party/zlib",
|
| ]
|
| }
|
|
|