diff --git a/DEPS b/DEPS
index 2117761..0d2437c 100644
--- a/DEPS
+++ b/DEPS
@@ -372,7 +372,7 @@
    Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + 'a28238bdeebc087071777001245df1876a11f5ee',
 
   'src/third_party/freetype2':
-   Var('flutter_git') + '/third_party/freetype2' + '@' + '1f03c1b2d7f2ae832a4fbe9d12bd96c3c15bbece',
+   Var('flutter_git') + '/third_party/freetype2' + '@' + '3234e16d2322c936f777d1ef046e689e78b6c52e',
 
   'src/third_party/root_certificates':
    Var('dart_git') + '/root_certificates.git' + '@' + Var('dart_root_certificates_rev'),
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
index 4a24eef..7442943 100644
--- a/ci/licenses_golden/licenses_third_party
+++ b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: 9eb1b057455a8ef0837cc9f25e3fbe0f
+Signature: 3df167c9fbaed774f6b261bf07754c42
 
 UNUSED LICENSES:
 
@@ -13537,8 +13537,295 @@
 
 ====================================================================================================
 LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/adler32.c + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/adler32.c
+FILE: ../../../third_party/zlib/adler32.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2011, 2016 Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/crc32.c + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/crc32.c
+FILE: ../../../third_party/zlib/crc32.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/ftzconf.h + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/ftzconf.h
+FILE: ../../../third_party/freetype2/src/gzip/zutil.h
+FILE: ../../../third_party/zlib/zconf.h
+FILE: ../../../third_party/zlib/zutil.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/gzguts.h + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/gzguts.h
+FILE: ../../../third_party/zlib/gzguts.h
+FILE: ../../../third_party/zlib/gzread.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/infback.c + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/infback.c
+FILE: ../../../third_party/freetype2/src/gzip/inflate.c
+FILE: ../../../third_party/freetype2/src/gzip/inflate.h
+FILE: ../../../third_party/zlib/contrib/optimizations/inflate.c
+FILE: ../../../third_party/zlib/infback.c
+FILE: ../../../third_party/zlib/inflate.c
+FILE: ../../../third_party/zlib/inflate.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2016 Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/inffast.c + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/inffast.c
+FILE: ../../../third_party/freetype2/src/gzip/inftrees.c
+FILE: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.c
+FILE: ../../../third_party/zlib/inffast.c
+FILE: ../../../third_party/zlib/inftrees.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2017 Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/inffast.h + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/inffast.h
+FILE: ../../../third_party/zlib/inffast.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2003, 2010 Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/inftrees.h + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/inftrees.h
+FILE: ../../../third_party/zlib/inftrees.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2005, 2010 Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/crc32.h
+FILE: ../../../third_party/freetype2/src/gzip/inffixed.h
+FILE: ../../../third_party/freetype2/src/gzip/patches/freetype-zlib.diff
+FILE: ../../../third_party/freetype2/src/gzip/zlib.h
+FILE: ../../../third_party/zlib/deflate.c
+FILE: ../../../third_party/zlib/zlib.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
+LIBRARY: zlib
+ORIGIN: ../../../third_party/freetype2/src/gzip/zutil.c + ../../../third_party/freetype2/src/gzip/zlib.h
+TYPE: LicenseType.zlib
+FILE: ../../../third_party/freetype2/src/gzip/zutil.c
+FILE: ../../../third_party/zlib/zutil.c
+----------------------------------------------------------------------------------------------------
+Copyright (C) 1995-2017 Jean-loup Gailly
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: freetype2
 ORIGIN: ../../../third_party/freetype2/docs/FTL.TXT
 TYPE: LicenseType.freetype
+FILE: ../../../third_party/freetype2/.gitlab-ci.yml
+FILE: ../../../third_party/freetype2/.gitmodules
 FILE: ../../../third_party/freetype2/devel/ft2build.h
 FILE: ../../../third_party/freetype2/devel/ftoption.h
 FILE: ../../../third_party/freetype2/include/freetype-flutter-config/ftmodule.h
@@ -13573,6 +13860,7 @@
 FILE: ../../../third_party/freetype2/include/freetype/ftincrem.h
 FILE: ../../../third_party/freetype2/include/freetype/ftlcdfil.h
 FILE: ../../../third_party/freetype2/include/freetype/ftlist.h
+FILE: ../../../third_party/freetype2/include/freetype/ftlogging.h
 FILE: ../../../third_party/freetype2/include/freetype/ftlzw.h
 FILE: ../../../third_party/freetype2/include/freetype/ftmac.h
 FILE: ../../../third_party/freetype2/include/freetype/ftmm.h
@@ -13630,9 +13918,11 @@
 FILE: ../../../third_party/freetype2/include/freetype/internal/services/svttglyf.h
 FILE: ../../../third_party/freetype2/include/freetype/internal/services/svwinfnt.h
 FILE: ../../../third_party/freetype2/include/freetype/internal/sfnt.h
+FILE: ../../../third_party/freetype2/include/freetype/internal/svginterface.h
 FILE: ../../../third_party/freetype2/include/freetype/internal/t1types.h
 FILE: ../../../third_party/freetype2/include/freetype/internal/tttypes.h
 FILE: ../../../third_party/freetype2/include/freetype/internal/wofftypes.h
+FILE: ../../../third_party/freetype2/include/freetype/otsvg.h
 FILE: ../../../third_party/freetype2/include/freetype/t1tables.h
 FILE: ../../../third_party/freetype2/include/freetype/ttnameid.h
 FILE: ../../../third_party/freetype2/include/freetype/tttables.h
@@ -13640,8 +13930,6 @@
 FILE: ../../../third_party/freetype2/include/ft2build.h
 FILE: ../../../third_party/freetype2/meson.build
 FILE: ../../../third_party/freetype2/modules.cfg
-FILE: ../../../third_party/freetype2/src/autofit/afangles.c
-FILE: ../../../third_party/freetype2/src/autofit/afangles.h
 FILE: ../../../third_party/freetype2/src/autofit/afblue.c
 FILE: ../../../third_party/freetype2/src/autofit/afblue.cin
 FILE: ../../../third_party/freetype2/src/autofit/afblue.dat
@@ -13661,8 +13949,6 @@
 FILE: ../../../third_party/freetype2/src/autofit/afindic.h
 FILE: ../../../third_party/freetype2/src/autofit/aflatin.c
 FILE: ../../../third_party/freetype2/src/autofit/aflatin.h
-FILE: ../../../third_party/freetype2/src/autofit/aflatin2.c
-FILE: ../../../third_party/freetype2/src/autofit/aflatin2.h
 FILE: ../../../third_party/freetype2/src/autofit/afloader.c
 FILE: ../../../third_party/freetype2/src/autofit/afloader.h
 FILE: ../../../third_party/freetype2/src/autofit/afmodule.c
@@ -13674,9 +13960,8 @@
 FILE: ../../../third_party/freetype2/src/autofit/afshaper.h
 FILE: ../../../third_party/freetype2/src/autofit/afstyles.h
 FILE: ../../../third_party/freetype2/src/autofit/aftypes.h
-FILE: ../../../third_party/freetype2/src/autofit/afwarp.c
-FILE: ../../../third_party/freetype2/src/autofit/afwarp.h
-FILE: ../../../third_party/freetype2/src/autofit/afwrtsys.h
+FILE: ../../../third_party/freetype2/src/autofit/afws-decl.h
+FILE: ../../../third_party/freetype2/src/autofit/afws-iter.h
 FILE: ../../../third_party/freetype2/src/autofit/autofit.c
 FILE: ../../../third_party/freetype2/src/base/ftadvanc.c
 FILE: ../../../third_party/freetype2/src/base/ftbase.c
@@ -13765,6 +14050,7 @@
 FILE: ../../../third_party/freetype2/src/cid/cidriver.h
 FILE: ../../../third_party/freetype2/src/cid/cidtoken.h
 FILE: ../../../third_party/freetype2/src/cid/type1cid.c
+FILE: ../../../third_party/freetype2/src/dlg/dlgwrap.c
 FILE: ../../../third_party/freetype2/src/gxvalid/gxvalid.c
 FILE: ../../../third_party/freetype2/src/gxvalid/gxvalid.h
 FILE: ../../../third_party/freetype2/src/gxvalid/gxvbsln.c
@@ -13889,6 +14175,15 @@
 FILE: ../../../third_party/freetype2/src/raster/ftrend1.h
 FILE: ../../../third_party/freetype2/src/raster/raster.c
 FILE: ../../../third_party/freetype2/src/raster/rasterrs.h
+FILE: ../../../third_party/freetype2/src/sdf/ftbsdf.c
+FILE: ../../../third_party/freetype2/src/sdf/ftsdf.c
+FILE: ../../../third_party/freetype2/src/sdf/ftsdf.h
+FILE: ../../../third_party/freetype2/src/sdf/ftsdfcommon.c
+FILE: ../../../third_party/freetype2/src/sdf/ftsdfcommon.h
+FILE: ../../../third_party/freetype2/src/sdf/ftsdferrs.h
+FILE: ../../../third_party/freetype2/src/sdf/ftsdfrend.c
+FILE: ../../../third_party/freetype2/src/sdf/ftsdfrend.h
+FILE: ../../../third_party/freetype2/src/sdf/sdf.c
 FILE: ../../../third_party/freetype2/src/sfnt/pngshim.c
 FILE: ../../../third_party/freetype2/src/sfnt/pngshim.h
 FILE: ../../../third_party/freetype2/src/sfnt/sfdriver.c
@@ -13920,6 +14215,8 @@
 FILE: ../../../third_party/freetype2/src/sfnt/ttpost.h
 FILE: ../../../third_party/freetype2/src/sfnt/ttsbit.c
 FILE: ../../../third_party/freetype2/src/sfnt/ttsbit.h
+FILE: ../../../third_party/freetype2/src/sfnt/ttsvg.c
+FILE: ../../../third_party/freetype2/src/sfnt/ttsvg.h
 FILE: ../../../third_party/freetype2/src/sfnt/woff2tags.c
 FILE: ../../../third_party/freetype2/src/sfnt/woff2tags.h
 FILE: ../../../third_party/freetype2/src/smooth/ftgrays.c
@@ -13928,6 +14225,10 @@
 FILE: ../../../third_party/freetype2/src/smooth/ftsmooth.c
 FILE: ../../../third_party/freetype2/src/smooth/ftsmooth.h
 FILE: ../../../third_party/freetype2/src/smooth/smooth.c
+FILE: ../../../third_party/freetype2/src/svg/ftsvg.c
+FILE: ../../../third_party/freetype2/src/svg/ftsvg.h
+FILE: ../../../third_party/freetype2/src/svg/svg.c
+FILE: ../../../third_party/freetype2/src/svg/svgtypes.h
 FILE: ../../../third_party/freetype2/src/truetype/truetype.c
 FILE: ../../../third_party/freetype2/src/truetype/ttdriver.c
 FILE: ../../../third_party/freetype2/src/truetype/ttdriver.h
@@ -13971,7 +14272,8 @@
 FILE: ../../../third_party/freetype2/src/winfonts/fnterrs.h
 FILE: ../../../third_party/freetype2/src/winfonts/winfnt.c
 FILE: ../../../third_party/freetype2/src/winfonts/winfnt.h
-FILE: ../../../third_party/freetype2/version.sed
+FILE: ../../../third_party/freetype2/subprojects/libpng.wrap
+FILE: ../../../third_party/freetype2/subprojects/zlib.wrap
 ----------------------------------------------------------------------------------------------------
 The FreeType Project LICENSE
 
@@ -14331,93 +14633,6 @@
 
 ====================================================================================================
 LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/gzip/adler32.c + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/adler32.c
-FILE: ../../../third_party/freetype2/src/gzip/infblock.c
-FILE: ../../../third_party/freetype2/src/gzip/infblock.h
-FILE: ../../../third_party/freetype2/src/gzip/infcodes.c
-FILE: ../../../third_party/freetype2/src/gzip/infcodes.h
-FILE: ../../../third_party/freetype2/src/gzip/inflate.c
-FILE: ../../../third_party/freetype2/src/gzip/inftrees.c
-FILE: ../../../third_party/freetype2/src/gzip/inftrees.h
-FILE: ../../../third_party/freetype2/src/gzip/infutil.c
-FILE: ../../../third_party/freetype2/src/gzip/infutil.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2002 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/gzip/ftzconf.h + ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/ftzconf.h
-FILE: ../../../third_party/freetype2/src/gzip/zutil.c
-FILE: ../../../third_party/freetype2/src/gzip/zutil.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2002 Jean-loup Gailly.
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
-ORIGIN: ../../../third_party/freetype2/src/gzip/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/freetype2/src/gzip/inffixed.h
-FILE: ../../../third_party/freetype2/src/gzip/zlib.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: freetype2
 ORIGIN: ../../../third_party/freetype2/src/pcf/pcf.c
 TYPE: LicenseType.mit
 FILE: ../../../third_party/freetype2/src/pcf/pcf.c
@@ -25183,32 +25398,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/adler32.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/adler32.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2011, 2016 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/compress.c + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/compress.c + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/compress.c
 ----------------------------------------------------------------------------------------------------
@@ -25336,34 +25526,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.c
-FILE: ../../../third_party/zlib/inffast.c
-FILE: ../../../third_party/zlib/inftrees.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2017 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.h + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.h + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/contrib/optimizations/inffast_chunk.h
 ----------------------------------------------------------------------------------------------------
@@ -25389,34 +25552,6 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/contrib/optimizations/inflate.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/contrib/optimizations/inflate.c
-FILE: ../../../third_party/zlib/infback.c
-FILE: ../../../third_party/zlib/inflate.c
-FILE: ../../../third_party/zlib/inflate.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2016 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
 ORIGIN: ../../../third_party/zlib/contrib/optimizations/insert_string.h + ../../../LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../third_party/zlib/contrib/optimizations/insert_string.h
@@ -25454,32 +25589,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/crc32.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/crc32.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/crc_folding.c + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/crc_folding.c + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/crc_folding.c
 ----------------------------------------------------------------------------------------------------
@@ -25510,7 +25620,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/deflate.h + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/deflate.h + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/deflate.h
 ----------------------------------------------------------------------------------------------------
@@ -25535,7 +25645,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/fill_window_sse.c + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/fill_window_sse.c + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/fill_window_sse.c
 ----------------------------------------------------------------------------------------------------
@@ -25640,7 +25750,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/gzclose.c + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/gzclose.c + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/gzclose.c
 ----------------------------------------------------------------------------------------------------
@@ -25665,33 +25775,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/gzguts.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/gzguts.h
-FILE: ../../../third_party/zlib/gzread.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/gzlib.c + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/gzlib.c + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/gzlib.c
 FILE: ../../../third_party/zlib/gzwrite.c
@@ -25717,57 +25801,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/inffast.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/inffast.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2003, 2010 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/inftrees.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/inftrees.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2005, 2010 Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/trees.c + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/trees.c + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/trees.c
 ----------------------------------------------------------------------------------------------------
@@ -25793,7 +25827,7 @@
 
 ====================================================================================================
 LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/uncompr.c + ../../../third_party/zlib/zlib.h
+ORIGIN: ../../../third_party/zlib/uncompr.c + ../../../third_party/freetype2/src/gzip/zlib.h
 TYPE: LicenseType.zlib
 FILE: ../../../third_party/zlib/uncompr.c
 ----------------------------------------------------------------------------------------------------
@@ -25815,81 +25849,4 @@
    misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 ====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/zconf.h + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/zconf.h
-FILE: ../../../third_party/zlib/zutil.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/deflate.c
-FILE: ../../../third_party/zlib/zlib.h
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-
-====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/zutil.c + ../../../third_party/zlib/zlib.h
-TYPE: LicenseType.zlib
-FILE: ../../../third_party/zlib/zutil.c
-----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2017 Jean-loup Gailly
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-====================================================================================================
-Total license count: 410
+Total license count: 407
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
index b09822a..f26ca83 100644
--- a/ci/licenses_golden/tool_signature
+++ b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: fb1ee9723a82b06b7333d6cbb23dfe9b
+Signature: 270842a9eb9687ced20abdf5f131bafd
 
diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
index 04011bd..9cafd53 100644
--- a/tools/licenses/lib/main.dart
+++ b/tools/licenses/lib/main.dart
@@ -484,41 +484,45 @@
     : _target = _parseLicense(io), super(parent, io);
 
   static final RegExp _pattern = RegExp(
-    r'The  FreeType 2  font  engine is  copyrighted  work and  cannot be  used\n'
-    r'legally  without a  software license\.   In  order to  make this  project\n'
-    r'usable  to a vast  majority of  developers, we  distribute it  under two\n'
+    r'FREETYPE LICENSES\n'
+    r'-----------------\n'
+    r'\n'
+    r'The FreeType  2 font  engine is  copyrighted work  and cannot  be used\n'
+    r'legally without  a software  license\.  In order  to make  this project\n'
+    r'usable to  a vast majority of  developers, we distribute it  under two\n'
     r'mutually exclusive open-source licenses\.\n'
     r'\n'
-    r'This means  that \*you\* must choose  \*one\* of the  two licenses described\n'
-    r'below, then obey  all its terms and conditions when  using FreeType 2 in\n'
-    r'any of your projects or products.\n'
+    r'This means that \*you\* must choose  \*one\* of the two licenses described\n'
+    r'below, then obey all its terms and conditions when using FreeType 2 in\n'
+    r'any of your projects or products\.\n'
     r'\n'
-    r"  - The FreeType License, found in  the file `(FTL\.TXT)', which is similar\n"
-    r'    to the original BSD license \*with\* an advertising clause that forces\n'
-    r"    you  to  explicitly cite  the  FreeType  project  in your  product's\n"
-    r'    documentation\.  All  details are in the license  file\.  This license\n'
-    r"    is  suited  to products  which  don't  use  the GNU  General  Public\n"
-    r'    License\.\n'
+    r'  - The FreeType License,  found in the file  `docs/(FTL\.TXT)`, which is\n'
+    r'    similar to the  original BSD license \*with\*  an advertising clause\n'
+    r'    that forces  you to explicitly  cite the FreeType project  in your\n'
+    r"    product's  documentation\.  All  details are  in the  license file\.\n"
+    r"    This license is suited to products which don't use the GNU General\n"
+    r'    Public License\.\n'
     r'\n'
-    r'    Note that  this license  is  compatible  to the  GNU General  Public\n'
+    r'    Note that  this license  is compatible to  the GNU  General Public\n'
     r'    License version 3, but not version 2\.\n'
     r'\n'
-    r"  - The GNU General Public License version 2, found in  `GPLv2\.TXT' \(any\n"
-    r'    later version can be used  also\), for programs which already use the\n'
-    r'    GPL\.  Note  that the  FTL is  incompatible  with  GPLv2 due  to  its\n'
-    r'    advertisement clause\.\n'
+    r'  - The   GNU   General   Public   License   version   2,   found   in\n'
+    r'    `docs/GPLv2\.TXT`  \(any  later  version  can  be  used  also\),  for\n'
+    r'    programs  which  already  use  the  GPL\.  Note  that  the  FTL  is\n'
+    r'    incompatible with GPLv2 due to its advertisement clause\.\n'
     r'\n'
-    r'The contributed BDF and PCF drivers  come with a license similar to that\n'
-    r'of the X Window System\.  It is compatible to the above two licenses \(see\n'
-    r'file src/bdf/README and  src/pcf/README\)\.  The same holds  for the files\n'
-    r"`fthash\.c' and  `fthash\.h'; their  code was  part of  the BDF  driver in\n"
-    r'earlier FreeType versions\.\n'
+    r'The contributed  BDF and PCF  drivers come  with a license  similar to\n'
+    r'that  of the  X Window  System\.   It is  compatible to  the above  two\n'
+    r'licenses \(see files `src/bdf/README`  and `src/pcf/README`\)\.  The same\n'
+    r'holds   for   the   source    code   files   `src/base/fthash\.c`   and\n'
+    r'`include/freetype/internal/fthash\.h`; they wer part  of the BDF driver\n'
+    r'in earlier FreeType versions\.\n'
     r'\n'
-    r'The gzip module uses the zlib license \(see src/gzip/zlib\.h\) which too is\n'
-    r'compatible to the above two licenses\.\n'
+    r'The gzip  module uses the  zlib license \(see  `src/gzip/zlib\.h`\) which\n'
+    r'too is compatible to the above two licenses\.\n'
     r'\n'
-    r'The MD5 checksum support \(only used for debugging in development builds\)\n'
-    r'is in the public domain\.\n'
+    r'The  MD5 checksum  support  \(only used  for  debugging in  development\n'
+    r'builds\) is in the public domain\.\n'
     r'\n*'
     r'--- end of LICENSE\.TXT ---\n*$'
   );
@@ -1386,13 +1390,6 @@
   _RepositoryFreetypeDocsDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
 
   @override
-  _RepositoryFile createFile(fs.IoNode entry) {
-    if (entry.name == 'LICENSE.TXT')
-      return _RepositoryFreetypeLicenseFile(this, entry as fs.TextFile);
-    return super.createFile(entry);
-  }
-
-  @override
   int get fileCount => 0;
 
   @override
@@ -1479,6 +1476,13 @@
   }
 
   @override
+  _RepositoryFile createFile(fs.IoNode entry) {
+    if (entry.name == 'LICENSE.TXT')
+      return _RepositoryFreetypeLicenseFile(this, entry as fs.TextFile);
+    return super.createFile(entry);
+  }
+
+  @override
   _RepositoryDirectory createSubdirectory(fs.Directory entry) {
     if (entry.name == 'src')
       return _RepositoryFreetypeSrcDirectory(this, entry);