commit 7bc88b191ed73ac7ea848d2b8048b1dfd3018459
author Seigo Nonaka <nona@google.com> Thu Nov 11 15:59:55 2021 -0800
committer Seigo Nonaka <nona@google.com> Fri Nov 12 00:10:47 2021 +0000
tree 3e4ad98162cc2b5d962bb3b2188659f19d3b6f9e
parent 6b0c72717397b47bb7f80d75c4398f0ce82abc7f
parent cd5c6cd0419ac5e4de975d6c476fb760bf06d2ce

Update HarfBuzz to 3.1.1

Merge commit 'cd5c6cd0419ac5e4de975d6c476fb760bf06d2ce'

Bug: 204812473
Test: TreeHugger

Change-Id: I64323d3c3a4b6b84ca32e153101e17d4d99c74cb

Android.bp

diff --git a/Android.bp b/Android.bp
index d69ed2b..57ae0b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -131,8 +131,8 @@
         "src/hb-ot-shape-complex-indic.cc",
         "src/hb-ot-shape-complex-khmer.cc",
         "src/hb-ot-shape-complex-myanmar.cc",
+        "src/hb-ot-shape-complex-syllabic.cc",
         "src/hb-ot-shape-complex-thai.cc",
-        "src/hb-ot-shape-complex-use-table.cc",
         "src/hb-ot-shape-complex-use.cc",
         "src/hb-ot-shape-complex-vowel-constraints.cc",
         "src/hb-ot-shape-fallback.cc",
@@ -181,8 +181,8 @@
 
     export_include_dirs: ["src"],
     cflags: [
+        "-DHAVE_PTHREAD",
         "-DHB_NO_PRAGMA_GCC_DIAGNOSTIC",
-        "-DHAVE_INTEL_ATOMIC_PRIMITIVES",
         "-DHAVE_OT",
         "-DHAVE_ICU",
         "-DHAVE_ICU_BUILTIN",