From c4de11b6d71f69e62035381e98e6c4bf04b6f928 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Mon, 26 Jul 2021 11:44:58 -0400 Subject: [PATCH] Don't build hb-icu Since "Build HarfBuzz without ICU support" e07555f6aa, HarfBuzz in Skia has not been using ICU. However, hb-icu support files are still being built. Remove them from the build. Change-Id: Ib8dcf8a2139255ee1a1019197c38414305ca082e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/432997 Reviewed-by: Florin Malita Commit-Queue: Ben Wagner --- modules/skshaper/src/SkShaper_harfbuzz.cpp | 1 - third_party/harfbuzz/BUILD.gn | 2 -- 2 files changed, 3 deletions(-) diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp index 7668be05db..6b609b7537 100644 --- a/modules/skshaper/src/SkShaper_harfbuzz.cpp +++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp @@ -33,7 +33,6 @@ #include "src/utils/SkUTF.h" #include -#include #include #include #include diff --git a/third_party/harfbuzz/BUILD.gn b/third_party/harfbuzz/BUILD.gn index 16b928f21d..173830de62 100644 --- a/third_party/harfbuzz/BUILD.gn +++ b/third_party/harfbuzz/BUILD.gn @@ -35,7 +35,6 @@ if (skia_use_system_harfbuzz) { "$_src/hb-deprecated.h", "$_src/hb-face.h", "$_src/hb-font.h", - "$_src/hb-icu.h", "$_src/hb-map.h", "$_src/hb-ot-font.h", "$_src/hb-ot-layout.h", @@ -101,7 +100,6 @@ if (skia_use_system_harfbuzz) { "$_src/hb-glib.cc", "$_src/hb-gobject-structs.cc", "$_src/hb-graphite2.cc", - "$_src/hb-icu.cc", "$_src/hb-iter.hh", "$_src/hb-kern.hh", "$_src/hb-machinery.hh",