NOT FOR LANDING Update FreeType to upstream 57a6733dcf7828fe3db9254edab33fda7c9f6a10.

third_party/freetype2/BUILD.gn

Index: third_party/freetype2/BUILD.gn
diff --git a/third_party/freetype2/BUILD.gn b/third_party/freetype2/BUILD.gn
index 0c91cd432ac06bfe6ac12afd9e503e0638136b57..332e783d5fd68a04407e0f1a324dff5339356ebf 100644
--- a/third_party/freetype2/BUILD.gn
+++ b/third_party/freetype2/BUILD.gn
@@ -16,6 +16,7 @@ shared_library("freetype2") {
   output_extension = "so.6"
 
   sources = [
+    "src/builds/unix/ftsystem.c",

[bungeman-skia, 2016/09/01 15:08:32]

Is there a good reason for this over src/base/ftsystem.c? It would seem a good
justification would be needed, seeing as this blocks future use of FreeType on
other platforms and I believe breaks memory tracking (Skia always sets the
allocator to use, I think this breaks that?)

     "src/src/autofit/autofit.c",
     "src/src/base/ftbase.c",
     "src/src/base/ftbbox.c",
@@ -23,6 +24,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,13 +32,12 @@ shared_library("freetype2") {
     "src/src/base/ftinit.c",
     "src/src/base/ftlcdfil.c",
     "src/src/base/ftmm.c",
+    "src/src/base/ftotval.c",

[bungeman-skia, 2016/09/01 15:08:33]

We neither need nor want this.

     "src/src/base/ftpfr.c",

[bungeman-skia, 2016/09/01 15:08:32]

No longer used.

     "src/src/base/ftstroke.c",
     "src/src/base/ftsynth.c",
-    "src/src/base/ftsystem.c",
     "src/src/base/fttype1.c",

[bungeman-skia, 2016/09/01 15:08:33]

No longer used.

     "src/src/base/ftwinfnt.c",

[bungeman-skia, 2016/09/01 15:08:33]

No longer used.

-    "src/src/base/ftxf86.c",
     "src/src/bdf/bdf.c",

[bungeman-skia, 2016/09/01 15:08:33]

No longer used.

     "src/src/cff/cff.c",
     "src/src/cid/type1cid.c",

[bungeman-skia, 2016/09/01 15:08:33]

No longer used.

@@ -58,6 +59,10 @@ shared_library("freetype2") {
 
   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,9 +74,9 @@ shared_library("freetype2") {
 
   public_configs = [ ":freetype2_config" ]
 
-  libs = [ "z" ]
-
   deps = [
     "//build/config/sanitizers:deps",
+    "//third_party/libpng",
+    "//third_party/zlib",
   ]
 }