diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 19:34:40 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 19:34:40 +0000 |
| commit | ac80cf5aa369350ddd6a8f6db1ad45fb66142126 (patch) | |
| tree | 0258b98f93e1df1296933281b274b4268c8134c4 /third_party | |
| parent | 5719be8e91ac06a106e27c52232947016393c084 (diff) | |
| download | chromium_src-ac80cf5aa369350ddd6a8f6db1ad45fb66142126.zip chromium_src-ac80cf5aa369350ddd6a8f6db1ad45fb66142126.tar.gz chromium_src-ac80cf5aa369350ddd6a8f6db1ad45fb66142126.tar.bz2 | |
Pull GN binaries at r275179
This additionally has the following patch checked in:
https://codereview.chromium.org/314053004/
which fixes the V8 build with this new version.
Updates the freetype2 build file to account for the new escaping rules.
R=scottmg@chromium.org
TBR=scottmg
Review URL: https://codereview.chromium.org/317053004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/freetype2/BUILD.gn | 7 |
1 files changed, 3 insertions, 4 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" ] |