From fb0d89bacfa750eb19a6786c8aa6feed057619d6 Mon Sep 17 00:00:00 2001 From: zhongning5 Date: Tue, 10 Jun 2025 19:19:59 +0800 Subject: [PATCH] =?UTF-8?q?SKIA=E4=B8=BB=E4=BD=93=E7=9A=84=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=BE=9D=E8=B5=96=E4=B8=8EOH=20third=5Fparty=E5=BD=92?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhongning5 Change-Id: I997d1d5296964c0c723283bc318ee6738389136e --- BUILD.gn | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++-- bundle.json | 6 +- 2 files changed, 189 insertions(+), 8 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 00fa3f7f..2fffa884 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -20,54 +20,226 @@ config("harfbuzz_config") { action("harfbuzz_action") { script = "//third_party/harfbuzz/install.py" outputs = [ + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/classdef-graph.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/coverage-graph.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/graph.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/gsubgpos-context.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/gsubgpos-context.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/gsubgpos-graph.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/markbasepos-graph.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/pairpos-graph.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/serialize.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/graph/split-helpers.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-ankr-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-bsln-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-common.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-feat-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-just-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-kerx-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-morx-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-opbd-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout-trak-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-layout.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-ltag-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-map.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat-map.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-aat.h", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-algs.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-array.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-atomic.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-bimap.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-bit-page.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-bit-set-invertible.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-bit-set.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-blob.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-blob.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-buffer-deserialize-json.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-buffer-deserialize-text-glyphs.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-buffer-deserialize-text-unicode.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-buffer-serialize.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-buffer-verify.cc", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-buffer.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-buffer.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-cache.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-cff-interp-common.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-cff-interp-cs-common.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-cff-interp-dict-common.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-cff1-interp-cs.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-cff2-interp-cs.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-common.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-config.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-cplusplus.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-debug.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-dispatch.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-draw.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-draw.h", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-draw.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-face-builder.cc", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-face.cc", - "${target_gen_dir}/harfbuzz-11.0.0/src/hb-fallback-shape.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-face.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-font.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-font.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-geometry.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-iter.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-kern.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-limits.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-machinery.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-map.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-map.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-meta.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ms-feature-ranges.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-multimap.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-mutex.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-null.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-number-parser.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-number.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-number.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-object.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-open-file.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-open-type.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-cff-common.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-cff1-std-str.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-cff1-table.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-cff1-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-cff2-table.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-cff2-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-cmap-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-color.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-color.h", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-deprecated.h", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-face-table-list.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-face.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-face.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-font.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-gasp-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-glyf-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-hdmx-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-head-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-hhea-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-hmtx-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-kern-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout-base-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout-common.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout-gdef-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout-gpos-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout-gsub-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout-gsubgpos.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout-jstf-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-layout.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-map.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-map.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-math-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-math.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-maxp-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-meta-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-meta.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-meta.h", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-metrics.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-metrics.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-name-language-static.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-name-language.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-name-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-name.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-name.h", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-os2-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-os2-unicode-ranges.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-post-macroman.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-post-table-v2subset.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-post-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape-fallback.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape-fallback.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape-normalize.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape-normalize.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-arabic-fallback.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-arabic-joining-list.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-arabic-pua.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-arabic-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-arabic.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-arabic.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-default.cc", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-hangul.cc", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-hebrew.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-indic-machine.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-indic-table.cc", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-indic.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-indic.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-khmer-machine.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-khmer.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-myanmar-machine.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-myanmar.cc", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-syllabic.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-syllabic.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-thai.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-use-machine.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-use-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-use.cc", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-vowel-constraints.cc", - "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape-fallback.cc", - "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape-normalize.cc", - "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shape.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper-vowel-constraints.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-shaper.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-stat-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-tag-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-tag.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var-avar-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var-common.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var-cvar-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var-fvar-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var-gvar-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var-hvar-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var-mvar-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var-varc-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-var.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ot-vorg-table.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-outline.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-outline.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-paint-extents.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-paint-extents.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-paint.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-paint.h", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-paint.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-pool.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-priority-queue.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-sanitize.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-serialize.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-set-digest.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-set.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-set.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-shape-plan.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-shape-plan.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-shape.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-shaper-impl.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-shaper-list.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-shaper.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-shaper.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-static.cc", - "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-cff2.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-string-array.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-accelerator.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-cff-common.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-cff-common.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-cff1.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-cff2.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-input.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-input.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-instancer-iup.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-instancer-iup.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-instancer-solver.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-instancer-solver.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-plan-member-list.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-plan.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset-plan.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-subset.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ucd-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-ucd.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-unicode-emoji-table.hh", "${target_gen_dir}/harfbuzz-11.0.0/src/hb-unicode.cc", - "${target_gen_dir}/harfbuzz-11.0.0/src/hb-face-builder.cc", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-unicode.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-utf.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb-vector.hh", + "${target_gen_dir}/harfbuzz-11.0.0/src/hb.hh", ] inputs = [ "//third_party/harfbuzz/harfbuzz-11.0.0.tar.xz" ] @@ -126,7 +298,12 @@ if (defined(ohos_lite)) { sources = get_target_outputs(":harfbuzz_action") deps = [ ":harfbuzz_action" ] include_dirs = [ "${target_gen_dir}/harfbuzz-11.0.0/src" ] - defines = [ "HAVE_PTHREAD = 1" ] + defines = [ + "HAVE_PTHREAD = 1", + "HAVE_OT", + "HB_NO_FALLBACK_SHAPE", + "HB_NO_WIN1256", + ] public_configs = [ ":harfbuzz_config" ] part_name = "harfbuzz" subsystem_name = "thirdparty" diff --git a/bundle.json b/bundle.json index 87e50620..53968da8 100644 --- a/bundle.json +++ b/bundle.json @@ -30,7 +30,11 @@ "sub_component": [ "//third_party/harfbuzz:harfbuzz_static" ], - "inner_kits": [], + "inner_kits": [ + { + "name": "//third_party/harfbuzz:harfbuzz_static" + } + ], "test": [] } } -- Gitee