diff options
| -rw-r--r-- | third_party/freetype2/BUILD.gn | 7 | ||||
| -rw-r--r-- | tools/gn/bin/linux/gn.sha1 | 2 | ||||
| -rw-r--r-- | tools/gn/bin/linux/gn32.sha1 | 2 | ||||
| -rw-r--r-- | tools/gn/bin/mac/gn.sha1 | 2 | ||||
| -rw-r--r-- | tools/gn/bin/win/gn.exe.sha1 | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/third_party/freetype2/BUILD.gn b/third_party/freetype2/BUILD.gn index 636772c..11e951a 100644 --- a/third_party/freetype2/BUILD.gn +++ b/third_party/freetype2/BUILD.gn @@ -56,10 +56,9 @@ shared_library("freetype2") { "FT_CONFIG_OPTION_SYSTEM_ZLIB", "FT2_BUILD_LIBRARY", - # TODO: crbug.com/358764 - we shouldn't need to escape these defines. - "'FT_CONFIG_CONFIG_H=<ftconfig.h>'", # See comments in README.chromium. - "'FT_CONFIG_MODULES_H=<ftmodule.h>'", # See comments in README.chromium. - "'FT_CONFIG_OPTIONS_H=<ftoption.h>'", # See comments in README.chromium. + "FT_CONFIG_CONFIG_H=<ftconfig.h>", # See comments in README.chromium. + "FT_CONFIG_MODULES_H=<ftmodule.h>", # See comments in README.chromium. + "FT_CONFIG_OPTIONS_H=<ftoption.h>", # See comments in README.chromium. ] configs -= [ "//build/config/compiler:chromium_code" ] diff --git a/tools/gn/bin/linux/gn.sha1 b/tools/gn/bin/linux/gn.sha1 index b2e67f6..7a3cec8 100644 --- a/tools/gn/bin/linux/gn.sha1 +++ b/tools/gn/bin/linux/gn.sha1 @@ -1 +1 @@ -8b2de69dd544188ae7813d4e08b5b1b04f9aa9f1
\ No newline at end of file +224b6fd62d2187c3dfad190e998187f6ee20b727
\ No newline at end of file diff --git a/tools/gn/bin/linux/gn32.sha1 b/tools/gn/bin/linux/gn32.sha1 index 2640fac..d4183fa 100644 --- a/tools/gn/bin/linux/gn32.sha1 +++ b/tools/gn/bin/linux/gn32.sha1 @@ -1 +1 @@ -1d1659f5d656746c5be525ce2b924faae4e237db
\ No newline at end of file +ca1b68df96b5b9013258d30d078354e9bf81d407
\ No newline at end of file diff --git a/tools/gn/bin/mac/gn.sha1 b/tools/gn/bin/mac/gn.sha1 index a479b66..22ffdf7 100644 --- a/tools/gn/bin/mac/gn.sha1 +++ b/tools/gn/bin/mac/gn.sha1 @@ -1 +1 @@ -34f931d05f6f0d949911c48d223d3af282feb393 +6d7917d003a4776641b6ba19bfcef618e6daf3a9 diff --git a/tools/gn/bin/win/gn.exe.sha1 b/tools/gn/bin/win/gn.exe.sha1 index 8e1e546..80dfd63 100644 --- a/tools/gn/bin/win/gn.exe.sha1 +++ b/tools/gn/bin/win/gn.exe.sha1 @@ -1,2 +1,2 @@ -753fae83cdf54ffdc241a3206d0f27e07ac4ad8c +f8c407945b6af5ae2742a5ba59ee848a21e506ae |