Roll HarfBuzz to 11.0.0 (#166596)

Fixes https://github.com/flutter/flutter/issues/162819
2025-04-07 20:25:34 +00:00
parent b44137f078
commit 920865d4a2
8 changed files with 337 additions and 34 deletions
--- a/engine/src/flutter/build/secondary/flutter/third_party/harfbuzz/BUILD.gn
+++ b/engine/src/flutter/build/secondary/flutter/third_party/harfbuzz/BUILD.gn
@@ -0,0 +1,177 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("harfbuzz_config") {
+  include_dirs = [ "src" ]
+}
+
+config("harfbuzz_flags") {
+  cflags = []
+  if (is_clang) {
+    cflags += [
+      "-Wno-missing-field-initializers",
+      "-Wno-unused-variable",
+      "-Wno-sign-compare",
+    ]
+  }
+
+  defines = [
+    "HAVE_OT",
+    "HAVE_ICU",
+    "HAVE_ICU_BUILTIN",
+    "HB_NO_VISIBILITY",
+  ]
+
+  if (is_linux || is_android || is_fuchsia) {
+    defines += [ "HAVE_PTHREAD" ]
+  }
+}
+
+source_set("harfbuzz_sources") {
+  sources = [
+    "src/hb-aat-layout.cc",
+    "src/hb-aat-map.cc",
+    "src/hb-blob.cc",
+    "src/hb-buffer-serialize.cc",
+    "src/hb-buffer-verify.cc",
+    "src/hb-buffer.cc",
+    "src/hb-common.cc",
+    "src/hb-draw.cc",
+    "src/hb-face-builder.cc",
+    "src/hb-face.cc",
+    "src/hb-fallback-shape.cc",
+    "src/hb-font.cc",
+    "src/hb-map.cc",
+    "src/hb-number.cc",
+    "src/hb-ot-cff1-table.cc",
+    "src/hb-ot-cff2-table.cc",
+    "src/hb-ot-color.cc",
+    "src/hb-ot-face.cc",
+    "src/hb-ot-font.cc",
+    "src/hb-ot-layout.cc",
+    "src/hb-ot-map.cc",
+    "src/hb-ot-math.cc",
+    "src/hb-ot-meta.cc",
+    "src/hb-ot-metrics.cc",
+    "src/hb-ot-name.cc",
+    "src/hb-ot-shape-fallback.cc",
+    "src/hb-ot-shape-normalize.cc",
+    "src/hb-ot-shape.cc",
+    "src/hb-ot-shaper-arabic.cc",
+    "src/hb-ot-shaper-default.cc",
+    "src/hb-ot-shaper-hangul.cc",
+    "src/hb-ot-shaper-hebrew.cc",
+    "src/hb-ot-shaper-indic-table.cc",
+    "src/hb-ot-shaper-indic.cc",
+    "src/hb-ot-shaper-khmer.cc",
+    "src/hb-ot-shaper-myanmar.cc",
+    "src/hb-ot-shaper-syllabic.cc",
+    "src/hb-ot-shaper-thai.cc",
+    "src/hb-ot-shaper-use.cc",
+    "src/hb-ot-shaper-vowel-constraints.cc",
+    "src/hb-ot-tag.cc",
+    "src/hb-ot-var.cc",
+    "src/hb-outline.cc",
+    "src/hb-paint-extents.cc",
+    "src/hb-paint.cc",
+    "src/hb-set.cc",
+    "src/hb-shape-plan.cc",
+    "src/hb-shape.cc",
+    "src/hb-shaper.cc",
+    "src/hb-static.cc",
+    "src/hb-style.cc",
+    "src/hb-ucd.cc",
+    "src/hb-unicode.cc",
+  ]
+
+  configs += [ ":harfbuzz_flags" ]
+
+  public_configs = [ ":harfbuzz_config" ]
+
+  deps = [
+    "//third_party/freetype2",
+    "//third_party/icu:icuuc",
+  ]
+}
+
+source_set("harfbuzz_subset") {
+  sources = [
+    "src/graph/gsubgpos-context.cc",
+    "src/hb-aat-layout.cc",
+    "src/hb-aat-map.cc",
+    "src/hb-blob.cc",
+    "src/hb-buffer-serialize.cc",
+    "src/hb-buffer-verify.cc",
+    "src/hb-buffer.cc",
+    "src/hb-common.cc",
+    "src/hb-draw.cc",
+    "src/hb-face-builder.cc",
+    "src/hb-face.cc",
+    "src/hb-fallback-shape.cc",
+    "src/hb-font.cc",
+    "src/hb-map.cc",
+    "src/hb-number.cc",
+    "src/hb-ot-cff1-table.cc",
+    "src/hb-ot-cff2-table.cc",
+    "src/hb-ot-color.cc",
+    "src/hb-ot-face.cc",
+    "src/hb-ot-font.cc",
+    "src/hb-ot-layout.cc",
+    "src/hb-ot-map.cc",
+    "src/hb-ot-math.cc",
+    "src/hb-ot-meta.cc",
+    "src/hb-ot-metrics.cc",
+    "src/hb-ot-name.cc",
+    "src/hb-ot-shape-fallback.cc",
+    "src/hb-ot-shape-normalize.cc",
+    "src/hb-ot-shape.cc",
+    "src/hb-ot-shaper-arabic.cc",
+    "src/hb-ot-shaper-default.cc",
+    "src/hb-ot-shaper-hangul.cc",
+    "src/hb-ot-shaper-hebrew.cc",
+    "src/hb-ot-shaper-indic-table.cc",
+    "src/hb-ot-shaper-indic.cc",
+    "src/hb-ot-shaper-khmer.cc",
+    "src/hb-ot-shaper-myanmar.cc",
+    "src/hb-ot-shaper-syllabic.cc",
+    "src/hb-ot-shaper-thai.cc",
+    "src/hb-ot-shaper-use.cc",
+    "src/hb-ot-shaper-vowel-constraints.cc",
+    "src/hb-ot-tag.cc",
+    "src/hb-ot-var.cc",
+    "src/hb-outline.cc",
+    "src/hb-paint-extents.cc",
+    "src/hb-paint.cc",
+    "src/hb-set.cc",
+    "src/hb-shape-plan.cc",
+    "src/hb-shape.cc",
+    "src/hb-shaper.cc",
+    "src/hb-static.cc",
+    "src/hb-style.cc",
+    "src/hb-subset-cff-common.cc",
+    "src/hb-subset-cff1.cc",
+    "src/hb-subset-cff2.cc",
+    "src/hb-subset-input.cc",
+    "src/hb-subset-instancer-iup.cc",
+    "src/hb-subset-instancer-solver.cc",
+    "src/hb-subset-plan.cc",
+    "src/hb-subset.cc",
+    "src/hb-ucd.cc",
+    "src/hb-unicode.cc",
+  ]
+
+  configs += [ ":harfbuzz_flags" ]
+
+  public_configs = [ ":harfbuzz_config" ]
+
+  deps = [
+    "//third_party/freetype2",
+    "//third_party/icu:icuuc",
+  ]
+}
+
+source_set("harfbuzz") {
+  output_name = "harfbuzz"
+  public_deps = [ ":harfbuzz_sources" ]
+}
--- a/engine/src/flutter/ci/licenses.sh
+++ b/engine/src/flutter/ci/licenses.sh
@@ -173,7 +173,7 @@ function verify_licenses() (

  local actualLicenseCount
  actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
-  local expectedLicenseCount=842
+  local expectedLicenseCount=846

  if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
    echo "=============================== ERROR ==============================="
--- a/engine/src/flutter/ci/licenses_golden/excluded_files
+++ b/engine/src/flutter/ci/licenses_golden/excluded_files
@@ -1944,7 +1944,6 @@
 ../../../flutter/third_party/harfbuzz/CMakeLists.txt
 ../../../flutter/third_party/harfbuzz/CONFIG.md
 ../../../flutter/third_party/harfbuzz/NEWS
-../../../flutter/third_party/harfbuzz/README
 ../../../flutter/third_party/harfbuzz/README.md
 ../../../flutter/third_party/harfbuzz/README.mingw.md
 ../../../flutter/third_party/harfbuzz/README.python.md
@@ -1953,16 +1952,9 @@
 ../../../flutter/third_party/harfbuzz/TESTING.md
 ../../../flutter/third_party/harfbuzz/THANKS
 ../../../flutter/third_party/harfbuzz/docs
-../../../flutter/third_party/harfbuzz/git.mk
-../../../flutter/third_party/harfbuzz/m4/ax_check_link_flag.m4
-../../../flutter/third_party/harfbuzz/m4/ax_code_coverage.m4
-../../../flutter/third_party/harfbuzz/m4/ax_cxx_compile_stdcxx.m4
-../../../flutter/third_party/harfbuzz/m4/ax_pthread.m4
 ../../../flutter/third_party/harfbuzz/meson.build
-../../../flutter/third_party/harfbuzz/perf/README.md
-../../../flutter/third_party/harfbuzz/perf/meson.build
+../../../flutter/third_party/harfbuzz/perf
 ../../../flutter/third_party/harfbuzz/replace-enum-strings.cmake
-../../../flutter/third_party/harfbuzz/src/Makefile.sources
 ../../../flutter/third_party/harfbuzz/src/addTable.py
 ../../../flutter/third_party/harfbuzz/src/check-c-linkage-decls.py
 ../../../flutter/third_party/harfbuzz/src/check-externs.py
@@ -1972,6 +1964,7 @@
 ../../../flutter/third_party/harfbuzz/src/check-static-inits.py
 ../../../flutter/third_party/harfbuzz/src/check-symbols.py
 ../../../flutter/third_party/harfbuzz/src/fix_get_types.py
+../../../flutter/third_party/harfbuzz/src/fontations/meson.build
 ../../../flutter/third_party/harfbuzz/src/gen-arabic-joining-list.py
 ../../../flutter/third_party/harfbuzz/src/gen-arabic-pua.py
 ../../../flutter/third_party/harfbuzz/src/gen-arabic-table.py
@@ -1986,6 +1979,10 @@
 ../../../flutter/third_party/harfbuzz/src/gen-ucd-table.py
 ../../../flutter/third_party/harfbuzz/src/gen-use-table.py
 ../../../flutter/third_party/harfbuzz/src/gen-vowel-constraints.py
+../../../flutter/third_party/harfbuzz/src/hb-bit-vector.hh
+../../../flutter/third_party/harfbuzz/src/hb-directwrite-shape.cc
+../../../flutter/third_party/harfbuzz/src/hb-directwrite.hh
+../../../flutter/third_party/harfbuzz/src/hb-fontations.h
 ../../../flutter/third_party/harfbuzz/src/justify.py
 ../../../flutter/third_party/harfbuzz/src/meson.build
 ../../../flutter/third_party/harfbuzz/src/relative_to.py
--- a/engine/src/flutter/ci/licenses_golden/licenses_flutter
+++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter
@@ -63796,9 +63796,13 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

 ====================================================================================================
 LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-coretext-shape.cc
 ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-coretext.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-coretext.hh
 TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-coretext-shape.cc
 FILE: ../../../flutter/third_party/harfbuzz/src/hb-coretext.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-coretext.hh
 ----------------------------------------------------------------------------------------------------
 Copyright © 2012,2013  Mozilla Foundation.
 Copyright © 2012,2013  Google, Inc.
@@ -65200,8 +65204,8 @@ ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/serialize.hh
 ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/split-helpers.hh
 ORIGIN: ../../../flutter/third_party/harfbuzz/src/graph/test-classdef-graph.cc
 ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-accelerator.hh
-ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-repacker.cc
-ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-repacker.h
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-serialize.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-serialize.h
 TYPE: LicenseType.unknown
 FILE: ../../../flutter/third_party/harfbuzz/src/graph/classdef-graph.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/graph/coverage-graph.hh
@@ -65215,8 +65219,8 @@ FILE: ../../../flutter/third_party/harfbuzz/src/graph/serialize.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/graph/split-helpers.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/graph/test-classdef-graph.cc
 FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-accelerator.hh
-FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-repacker.cc
-FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-repacker.h
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-serialize.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-serialize.h
 ----------------------------------------------------------------------------------------------------
 Copyright © 2022  Google, Inc.

@@ -65332,10 +65336,12 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 ====================================================================================================
 LIBRARY: harfbuzz
 ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-cplusplus.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-geometry.hh
 ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-paint-extents.cc
 ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-paint-extents.hh
 TYPE: LicenseType.unknown
 FILE: ../../../flutter/third_party/harfbuzz/src/hb-cplusplus.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-geometry.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/hb-paint-extents.cc
 FILE: ../../../flutter/third_party/harfbuzz/src/hb-paint-extents.hh
 ----------------------------------------------------------------------------------------------------
@@ -65542,6 +65548,130 @@ ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 ====================================================================================================

+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-cff.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/test-cff.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2024  David Corbett
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-coretext-font.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-varc-table.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-instancer-iup.cc
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-subset-instancer-iup.hh
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-coretext-font.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-ot-var-varc-table.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-instancer-iup.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-subset-instancer-iup.hh
+----------------------------------------------------------------------------------------------------
+Copyright © 2024  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-directwrite-font.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-directwrite-font.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2025  Google, Inc.
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
+====================================================================================================
+LIBRARY: harfbuzz
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/hb-decycler.hh
+ORIGIN: ../../../flutter/third_party/harfbuzz/src/test-decycler.cc
+TYPE: LicenseType.unknown
+FILE: ../../../flutter/third_party/harfbuzz/src/hb-decycler.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/test-decycler.cc
+----------------------------------------------------------------------------------------------------
+Copyright © 2025 Behdad Esfahbod
+
+This is part of HarfBuzz, a text shaping library.
+
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+====================================================================================================
+
 ====================================================================================================
 LIBRARY: glslang
 ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/Include/SpirvIntrinsics.h
@@ -65597,21 +65727,6 @@ FILE: ../../../flutter/third_party/harfbuzz/.circleci/config.yml
 FILE: ../../../flutter/third_party/harfbuzz/.codecov.yml
 FILE: ../../../flutter/third_party/harfbuzz/harfbuzz.doap
 FILE: ../../../flutter/third_party/harfbuzz/meson_options.txt
-FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-font.cc
-FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-map.cc
-FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-ot.cc
-FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-set.cc
-FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-shape.cc
-FILE: ../../../flutter/third_party/harfbuzz/perf/benchmark-subset.cc
-FILE: ../../../flutter/third_party/harfbuzz/perf/fonts/Amiri-Regular.ttf
-FILE: ../../../flutter/third_party/harfbuzz/perf/fonts/NotoNastaliqUrdu-Regular.ttf
-FILE: ../../../flutter/third_party/harfbuzz/perf/fonts/Roboto-Regular.ttf
-FILE: ../../../flutter/third_party/harfbuzz/perf/texts/duployan.txt
-FILE: ../../../flutter/third_party/harfbuzz/perf/texts/en-thelittleprince.txt
-FILE: ../../../flutter/third_party/harfbuzz/perf/texts/en-words.txt
-FILE: ../../../flutter/third_party/harfbuzz/perf/texts/fa-thelittleprince.txt
-FILE: ../../../flutter/third_party/harfbuzz/perf/texts/fa-words.txt
-FILE: ../../../flutter/third_party/harfbuzz/perf/texts/hi-words.txt
 FILE: ../../../flutter/third_party/harfbuzz/src/ArabicPUASimplified.txt
 FILE: ../../../flutter/third_party/harfbuzz/src/ArabicPUATraditional.txt
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GPOS/Anchor.hh
@@ -65668,18 +65783,21 @@ FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SubstLookup.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/Layout/GSUB/SubstLookupSubTable.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Var/VARC/VARC.cc
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Var/VARC/VARC.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/OT/Var/VARC/coord-setter.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/CompositeGlyph.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/Glyph.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/GlyphHeader.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/SimpleGlyph.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/SubsetGlyph.hh
-FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/VarCompositeGlyph.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/composite-iter.hh
-FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/coord-setter.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/glyf-helpers.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/glyf.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/loca.hh
 FILE: ../../../flutter/third_party/harfbuzz/src/OT/glyf/path-builder.hh
+FILE: ../../../flutter/third_party/harfbuzz/src/fontations/Cargo.lock
+FILE: ../../../flutter/third_party/harfbuzz/src/fontations/Cargo.toml
 FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-cairo.pc.in
 FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-config.cmake.in
 FILE: ../../../flutter/third_party/harfbuzz/src/harfbuzz-gobject.pc.in
@@ -65708,7 +65826,9 @@ FILE: ../../../flutter/third_party/harfbuzz/subprojects/cairo.wrap
 FILE: ../../../flutter/third_party/harfbuzz/subprojects/freetype2.wrap
 FILE: ../../../flutter/third_party/harfbuzz/subprojects/glib.wrap
 FILE: ../../../flutter/third_party/harfbuzz/subprojects/google-benchmark.wrap
+FILE: ../../../flutter/third_party/harfbuzz/subprojects/libffi.wrap
 FILE: ../../../flutter/third_party/harfbuzz/subprojects/ragel.wrap
+FILE: ../../../flutter/third_party/harfbuzz/xkcd.png
 ----------------------------------------------------------------------------------------------------
 HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
 For parts of HarfBuzz that are licensed under different licenses see individual
@@ -78904,4 +79024,4 @@ freely, subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 ====================================================================================================

-Total license count: 842
+Total license count: 846
--- a/engine/src/flutter/ci/licenses_golden/tool_signature
+++ b/engine/src/flutter/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: cec01bd0c0bafa428e0b3b8cf34c3159
+Signature: 72079bc1edfa9c01900da12816e18f0e

--- a/engine/src/flutter/tools/licenses/lib/paths.dart
+++ b/engine/src/flutter/tools/licenses/lib/paths.dart
@@ -101,6 +101,11 @@ final Set<String> skippedPaths = <String>{
  r'flutter/third_party/google_fonts_for_unit_tests', // only used in web unit tests
  r'flutter/third_party/gradle',
  r'flutter/third_party/harfbuzz/docs',
+  r'flutter/third_party/harfbuzz/perf',
+  r'flutter/third_party/harfbuzz/src/hb-bit-vector.hh',
+  r'flutter/third_party/harfbuzz/src/hb-directwrite.hh',
+  r'flutter/third_party/harfbuzz/src/hb-directwrite-shape.cc',
+  r'flutter/third_party/harfbuzz/src/hb-fontations.h',
  r'flutter/third_party/harfbuzz/util', // utils are command line tools that do not end up in the binary
  r'flutter/third_party/icu/filters',
  r'flutter/third_party/icu/fuzzers',
--- a/engine/src/flutter/tools/licenses/lib/patterns.dart
+++ b/engine/src/flutter/tools/licenses/lib/patterns.dart
@@ -637,6 +637,10 @@ final List<LicenseReferencePattern> csReferencesByIdentifyingReference = <Licens
    pattern: RegExp(kIndent + r'For terms of use, see ([^ \n]+)', multiLine: true),
  ),

+  LicenseReferencePattern(
+    pattern: RegExp(kIndent + r'For terms of use and license, see ([^ \n]+)', multiLine: true),
+  ),
+
  LicenseReferencePattern(
    pattern: RegExp(kIndent + r'License & terms of use: ([^ \n]+)', multiLine: true),
  ),