From b1ff2bd00a6a289be29158e0acd134151b468d41 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Wed, 22 Jul 2020 07:46:50 -0700 Subject: [PATCH] 8249821: Separate libharfbuzz from libfontmanager Reviewed-by: erikj --- .../java.desktop/lib/Awt2dLibraries.gmk | 89 ++++++++++++++----- .../hb-aat-fdsc-table.hh | 0 .../hb-aat-layout-ankr-table.hh | 0 .../hb-aat-layout-bsln-table.hh | 0 .../hb-aat-layout-common.hh | 0 .../hb-aat-layout-feat-table.hh | 0 .../hb-aat-layout-just-table.hh | 0 .../hb-aat-layout-kerx-table.hh | 0 .../hb-aat-layout-lcar-table.hh | 0 .../hb-aat-layout-morx-table.hh | 0 .../hb-aat-layout-trak-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-aat-layout.cc | 0 .../harfbuzz => libharfbuzz}/hb-aat-layout.h | 0 .../harfbuzz => libharfbuzz}/hb-aat-layout.hh | 0 .../hb-aat-ltag-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-aat-map.cc | 0 .../harfbuzz => libharfbuzz}/hb-aat-map.hh | 0 .../harfbuzz => libharfbuzz}/hb-aat.h | 0 .../harfbuzz => libharfbuzz}/hb-array.hh | 0 .../harfbuzz => libharfbuzz}/hb-atomic.hh | 0 .../harfbuzz => libharfbuzz}/hb-blob.cc | 0 .../harfbuzz => libharfbuzz}/hb-blob.h | 0 .../harfbuzz => libharfbuzz}/hb-blob.hh | 0 .../hb-buffer-deserialize-json.hh | 0 .../hb-buffer-deserialize-text.hh | 0 .../hb-buffer-serialize.cc | 0 .../harfbuzz => libharfbuzz}/hb-buffer.cc | 0 .../harfbuzz => libharfbuzz}/hb-buffer.h | 0 .../harfbuzz => libharfbuzz}/hb-buffer.hh | 0 .../hb-cff-interp-common.hh | 0 .../hb-cff-interp-cs-common.hh | 0 .../hb-cff-interp-dict-common.hh | 0 .../hb-cff1-interp-cs.hh | 0 .../hb-cff2-interp-cs.hh | 0 .../harfbuzz => libharfbuzz}/hb-common.cc | 0 .../harfbuzz => libharfbuzz}/hb-common.h | 0 .../harfbuzz => libharfbuzz}/hb-coretext.cc | 0 .../harfbuzz => libharfbuzz}/hb-coretext.h | 0 .../harfbuzz => libharfbuzz}/hb-debug.hh | 0 .../harfbuzz => libharfbuzz}/hb-deprecated.h | 0 .../harfbuzz => libharfbuzz}/hb-dsalgs.hh | 0 .../harfbuzz => libharfbuzz}/hb-face.cc | 0 .../harfbuzz => libharfbuzz}/hb-face.h | 0 .../harfbuzz => libharfbuzz}/hb-face.hh | 0 .../hb-fallback-shape.cc | 0 .../harfbuzz => libharfbuzz}/hb-font.cc | 0 .../harfbuzz => libharfbuzz}/hb-font.h | 0 .../harfbuzz => libharfbuzz}/hb-font.hh | 0 .../harfbuzz => libharfbuzz}/hb-ft.cc | 0 .../harfbuzz => libharfbuzz}/hb-ft.h | 0 .../harfbuzz => libharfbuzz}/hb-iter.hh | 0 .../harfbuzz => libharfbuzz}/hb-kern.hh | 0 .../harfbuzz => libharfbuzz}/hb-machinery.hh | 0 .../harfbuzz => libharfbuzz}/hb-map.cc | 0 .../harfbuzz => libharfbuzz}/hb-map.h | 0 .../harfbuzz => libharfbuzz}/hb-map.hh | 0 .../harfbuzz => libharfbuzz}/hb-mutex.hh | 0 .../harfbuzz => libharfbuzz}/hb-null.hh | 0 .../harfbuzz => libharfbuzz}/hb-object.hh | 0 .../harfbuzz => libharfbuzz}/hb-open-file.hh | 0 .../harfbuzz => libharfbuzz}/hb-open-type.hh | 0 .../hb-ot-cff-common.hh | 0 .../hb-ot-cff1-table.cc | 0 .../hb-ot-cff1-table.hh | 0 .../hb-ot-cff2-table.cc | 0 .../hb-ot-cff2-table.hh | 0 .../hb-ot-cmap-table.hh | 0 .../hb-ot-color-cbdt-table.hh | 0 .../hb-ot-color-colr-table.hh | 0 .../hb-ot-color-cpal-table.hh | 0 .../hb-ot-color-sbix-table.hh | 0 .../hb-ot-color-svg-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-color.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-color.h | 0 .../hb-ot-deprecated.h | 0 .../harfbuzz => libharfbuzz}/hb-ot-face.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-face.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-font.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-font.h | 0 .../hb-ot-gasp-table.hh | 0 .../hb-ot-glyf-table.hh | 0 .../hb-ot-hdmx-table.hh | 0 .../hb-ot-head-table.hh | 0 .../hb-ot-hhea-table.hh | 0 .../hb-ot-hmtx-table.hh | 0 .../hb-ot-kern-table.hh | 0 .../hb-ot-layout-base-table.hh | 0 .../hb-ot-layout-common.hh | 0 .../hb-ot-layout-gdef-table.hh | 0 .../hb-ot-layout-gpos-table.hh | 0 .../hb-ot-layout-gsub-table.hh | 0 .../hb-ot-layout-gsubgpos.hh | 0 .../hb-ot-layout-jstf-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-layout.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-layout.h | 0 .../harfbuzz => libharfbuzz}/hb-ot-layout.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-map.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-map.hh | 0 .../hb-ot-math-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-math.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-math.h | 0 .../hb-ot-maxp-table.hh | 0 .../hb-ot-name-language.cc | 0 .../hb-ot-name-language.hh | 0 .../hb-ot-name-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-name.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-name.h | 0 .../hb-ot-os2-table.hh | 0 .../hb-ot-os2-unicode-ranges.hh | 0 .../hb-ot-post-macroman.hh | 0 .../hb-ot-post-table.hh | 0 .../hb-ot-shape-complex-arabic-fallback.hh | 0 .../hb-ot-shape-complex-arabic-table.hh | 0 .../hb-ot-shape-complex-arabic-win1256.hh | 0 .../hb-ot-shape-complex-arabic.cc | 0 .../hb-ot-shape-complex-arabic.hh | 0 .../hb-ot-shape-complex-default.cc | 0 .../hb-ot-shape-complex-hangul.cc | 0 .../hb-ot-shape-complex-hebrew.cc | 0 .../hb-ot-shape-complex-indic-machine.hh | 0 .../hb-ot-shape-complex-indic-table.cc | 0 .../hb-ot-shape-complex-indic.cc | 0 .../hb-ot-shape-complex-indic.hh | 0 .../hb-ot-shape-complex-khmer-machine.hh | 0 .../hb-ot-shape-complex-khmer.cc | 0 .../hb-ot-shape-complex-khmer.hh | 0 .../hb-ot-shape-complex-myanmar-machine.hh | 0 .../hb-ot-shape-complex-myanmar.cc | 0 .../hb-ot-shape-complex-myanmar.hh | 0 .../hb-ot-shape-complex-thai.cc | 0 .../hb-ot-shape-complex-use-machine.hh | 0 .../hb-ot-shape-complex-use-table.cc | 0 .../hb-ot-shape-complex-use.cc | 0 .../hb-ot-shape-complex-use.hh | 0 .../hb-ot-shape-complex-vowel-constraints.cc | 0 .../hb-ot-shape-complex-vowel-constraints.hh | 0 .../hb-ot-shape-complex.hh | 0 .../hb-ot-shape-fallback.cc | 0 .../hb-ot-shape-fallback.hh | 0 .../hb-ot-shape-normalize.cc | 0 .../hb-ot-shape-normalize.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-shape.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-shape.h | 0 .../harfbuzz => libharfbuzz}/hb-ot-shape.hh | 0 .../hb-ot-stat-table.hh | 0 .../hb-ot-tag-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-tag.cc | 0 .../hb-ot-var-avar-table.hh | 0 .../hb-ot-var-fvar-table.hh | 0 .../hb-ot-var-hvar-table.hh | 0 .../hb-ot-var-mvar-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot-var.cc | 0 .../harfbuzz => libharfbuzz}/hb-ot-var.h | 0 .../hb-ot-vorg-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-ot.h | 0 .../harfbuzz => libharfbuzz}/hb-set-digest.hh | 0 .../harfbuzz => libharfbuzz}/hb-set.cc | 0 .../harfbuzz => libharfbuzz}/hb-set.h | 0 .../harfbuzz => libharfbuzz}/hb-set.hh | 0 .../harfbuzz => libharfbuzz}/hb-shape-plan.cc | 0 .../harfbuzz => libharfbuzz}/hb-shape-plan.h | 0 .../harfbuzz => libharfbuzz}/hb-shape-plan.hh | 0 .../harfbuzz => libharfbuzz}/hb-shape.cc | 0 .../harfbuzz => libharfbuzz}/hb-shape.h | 0 .../hb-shaper-impl.hh | 0 .../hb-shaper-list.hh | 0 .../harfbuzz => libharfbuzz}/hb-shaper.cc | 0 .../harfbuzz => libharfbuzz}/hb-shaper.hh | 0 .../harfbuzz => libharfbuzz}/hb-static.cc | 0 .../hb-string-array.hh | 0 .../hb-subset-cff-common.cc | 0 .../hb-subset-cff-common.hh | 0 .../hb-subset-cff1.cc | 0 .../hb-subset-cff1.hh | 0 .../hb-subset-cff2.cc | 0 .../hb-subset-cff2.hh | 0 .../hb-subset-glyf.cc | 0 .../hb-subset-glyf.hh | 0 .../hb-subset-input.cc | 0 .../hb-subset-input.hh | 0 .../hb-subset-plan.cc | 0 .../hb-subset-plan.hh | 0 .../harfbuzz => libharfbuzz}/hb-subset.cc | 0 .../harfbuzz => libharfbuzz}/hb-subset.h | 0 .../harfbuzz => libharfbuzz}/hb-subset.hh | 0 .../harfbuzz => libharfbuzz}/hb-ucdn.cc | 0 .../harfbuzz => libharfbuzz}/hb-ucdn/ucdn.c | 0 .../harfbuzz => libharfbuzz}/hb-ucdn/ucdn.h | 0 .../hb-ucdn/ucdn_db.h | 0 .../hb-unicode-emoji-table.hh | 0 .../harfbuzz => libharfbuzz}/hb-unicode.cc | 0 .../harfbuzz => libharfbuzz}/hb-unicode.h | 0 .../harfbuzz => libharfbuzz}/hb-unicode.hh | 0 .../harfbuzz => libharfbuzz}/hb-utf.hh | 0 .../harfbuzz => libharfbuzz}/hb-vector.hh | 0 .../harfbuzz => libharfbuzz}/hb-version.h | 0 .../harfbuzz => libharfbuzz}/hb-warning.cc | 0 .../harfbuzz => libharfbuzz}/hb.h | 0 .../harfbuzz => libharfbuzz}/hb.hh | 0 199 files changed, 67 insertions(+), 22 deletions(-) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-fdsc-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-ankr-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-bsln-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-common.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-feat-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-just-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-kerx-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-lcar-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-morx-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout-trak-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-layout.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-ltag-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-map.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat-map.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-aat.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-array.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-atomic.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-blob.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-blob.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-blob.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-buffer-deserialize-json.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-buffer-deserialize-text.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-buffer-serialize.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-buffer.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-buffer.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-buffer.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-cff-interp-common.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-cff-interp-cs-common.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-cff-interp-dict-common.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-cff1-interp-cs.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-cff2-interp-cs.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-common.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-common.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-coretext.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-coretext.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-debug.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-deprecated.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-dsalgs.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-face.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-face.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-face.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-fallback-shape.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-font.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-font.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-font.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ft.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ft.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-iter.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-kern.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-machinery.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-map.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-map.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-map.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-mutex.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-null.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-object.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-open-file.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-open-type.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-cff-common.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-cff1-table.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-cff1-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-cff2-table.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-cff2-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-cmap-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-color-cbdt-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-color-colr-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-color-cpal-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-color-sbix-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-color-svg-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-color.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-color.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-deprecated.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-face.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-face.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-font.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-font.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-gasp-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-glyf-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-hdmx-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-head-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-hhea-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-hmtx-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-kern-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout-base-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout-common.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout-gdef-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout-gpos-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout-gsub-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout-gsubgpos.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout-jstf-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-layout.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-map.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-map.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-math-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-math.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-math.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-maxp-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-name-language.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-name-language.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-name-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-name.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-name.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-os2-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-os2-unicode-ranges.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-post-macroman.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-post-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-arabic-fallback.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-arabic-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-arabic-win1256.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-arabic.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-arabic.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-default.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-hangul.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-hebrew.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-indic-machine.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-indic-table.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-indic.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-indic.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-khmer-machine.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-khmer.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-khmer.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-myanmar-machine.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-myanmar.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-myanmar.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-thai.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-use-machine.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-use-table.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-use.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-use.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-vowel-constraints.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex-vowel-constraints.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-complex.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-fallback.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-fallback.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-normalize.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape-normalize.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-shape.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-stat-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-tag-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-tag.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-var-avar-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-var-fvar-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-var-hvar-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-var-mvar-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-var.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-var.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot-vorg-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ot.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-set-digest.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-set.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-set.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-set.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shape-plan.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shape-plan.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shape-plan.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shape.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shape.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shaper-impl.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shaper-list.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shaper.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-shaper.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-static.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-string-array.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-cff-common.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-cff-common.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-cff1.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-cff1.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-cff2.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-cff2.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-glyf.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-glyf.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-input.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-input.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-plan.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset-plan.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-subset.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ucdn.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ucdn/ucdn.c (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ucdn/ucdn.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-ucdn/ucdn_db.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-unicode-emoji-table.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-unicode.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-unicode.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-unicode.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-utf.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-vector.hh (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-version.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb-warning.cc (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb.h (100%) rename src/java.desktop/share/native/{libfontmanager/harfbuzz => libharfbuzz}/hb.hh (100%) diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk index 9499554e04c..03d7b58c239 100644 --- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk +++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk @@ -432,10 +432,15 @@ endif ########################################################################### -#### Begin harfbuzz configuration - HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND +# This is better than adding EXPORT_ALL_SYMBOLS +ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), ) + HARFBUZZ_CFLAGS += -DHB_EXTERN=__attribute__\(\(visibility\(\"default\"\)\)\) +else ifeq ($(TOOLCHAIN_TYPE), microsoft) + HARFBUZZ_CFLAGS += -DHB_EXTERN=__declspec\(dllexport\) +endif + ifeq ($(call isTargetOs, windows), false) HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \ -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \ @@ -448,18 +453,65 @@ ifeq ($(call isTargetOs, macosx), true) HARFBUZZ_CFLAGS += -DHAVE_CORETEXT endif ifeq ($(call isTargetOs, macosx), false) - LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc + LIBHARFBUZZ_EXCLUDE_FILES += harfbuzz/hb-coretext.cc endif # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later. -LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc +LIBHARFBUZZ_EXCLUDE_FILES += harfbuzz/hb-ft.cc -LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) +LIBHARFBUZZ_CFLAGS += $(HARFBUZZ_CFLAGS) -#### End harfbuzz configuration +# For use by libfontmanager: +ifeq ($(call isTargetOs, windows), true) + LIBHARFBUZZ_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libharfbuzz/harfbuzz.lib +else + LIBHARFBUZZ_LIBS := -lharfbuzz +endif + +LIBHARFBUZZ_EXTRA_HEADER_DIRS := \ + libharfbuzz/hb-ucdn \ + # + +LIBHARFBUZZ_OPTIMIZATION := HIGH + +LIBHARFBUZZ_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS + +$(eval $(call SetupJdkLibrary, BUILD_LIBHARFBUZZ, \ + NAME := harfbuzz, \ + EXCLUDE_FILES := $(LIBHARFBUZZ_EXCLUDE_FILES), \ + TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ + CFLAGS := $(CFLAGS_JDKLIB) $(LIBHARFBUZZ_CFLAGS), \ + CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBHARFBUZZ_CFLAGS), \ + OPTIMIZATION := $(LIBHARFBUZZ_OPTIMIZATION), \ + CFLAGS_windows = -DCC_NOEX, \ + EXTRA_HEADER_DIRS := $(LIBHARFBUZZ_EXTRA_HEADER_DIRS), \ + WARNINGS_AS_ERRORS_xlc := false, \ + DISABLED_WARNINGS_gcc := type-limits missing-field-initializers strict-aliasing, \ + DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \ + maybe-uninitialized class-memaccess, \ + DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \ + tautological-constant-out-of-range-compare int-to-pointer-cast \ + undef missing-field-initializers, \ + DISABLED_WARNINGS_microsoft := 4267 4244 4090 4146 4334 4819 4101 4068 4805 4138, \ + LDFLAGS := $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ + LDFLAGS_aix := -Wl$(COMMA)-berok, \ + LIBS := $(BUILD_LIBHARFBUZZ), \ + LIBS_unix := $(LIBM) $(LIBCXX), \ + LIBS_macosx := -framework CoreText -framework CoreFoundation -framework CoreGraphics, \ + LIBS_windows := user32.lib, \ +)) + +ifeq ($(FREETYPE_TO_USE), bundled) + $(BUILD_LIBHARFBUZZ): $(BUILD_LIBFREETYPE) +endif + +TARGETS += $(BUILD_LIBHARFBUZZ) + +########################################################################### LIBFONTMANAGER_EXTRA_HEADER_DIRS := \ - libfontmanager/harfbuzz \ - libfontmanager/harfbuzz/hb-ucdn \ + libharfbuzz \ common/awt \ common/font \ libawt/java2d \ @@ -467,8 +519,8 @@ LIBFONTMANAGER_EXTRA_HEADER_DIRS := \ libawt/java2d/loops \ # -LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS) -BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS) +LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS) $(HARFBUZZ_FLAGS) +BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS) $(LIBFREETYPE_LIBS) LIBFONTMANAGER_OPTIMIZATION := HIGH @@ -509,15 +561,9 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ CFLAGS_windows = -DCC_NOEX, \ EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \ WARNINGS_AS_ERRORS_xlc := false, \ - DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \ - type-limits missing-field-initializers implicit-fallthrough \ - strict-aliasing undef unused-function, \ - DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \ - maybe-uninitialized class-memaccess, \ - DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \ - tautological-constant-out-of-range-compare int-to-pointer-cast \ - sign-compare undef missing-field-initializers, \ - DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101 4068 4805 4138, \ + DISABLED_WARNINGS_gcc := sign-compare unused-function, \ + DISABLED_WARNINGS_clang := sign-compare, \ + DISABLED_WARNINGS_microsoft := 4018 4146 4244 4996, \ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \ $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -525,13 +571,12 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ - -framework CoreGraphics, \ + LIBS_macosx := -lawt_lwawt, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ $(WIN_AWT_LIB), \ )) -$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) +$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) $(BUILD_LIBHARFBUZZ) ifeq ($(call isTargetOs, macosx), true) $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt) diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-fdsc-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-fdsc-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-fdsc-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-fdsc-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-ankr-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-ankr-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-ankr-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-ankr-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-bsln-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-bsln-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-common.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-feat-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-feat-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-just-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-just-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-just-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-just-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-kerx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-kerx-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-lcar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-lcar-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-lcar-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-lcar-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-morx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-morx-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-trak-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-trak-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.cc b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.cc rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.h b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.h rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-ltag-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-ltag-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-ltag-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-ltag-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.cc b/src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.cc rename to src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-map.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.hh rename to src/java.desktop/share/native/libharfbuzz/hb-aat-map.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat.h b/src/java.desktop/share/native/libharfbuzz/hb-aat.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat.h rename to src/java.desktop/share/native/libharfbuzz/hb-aat.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-array.hh b/src/java.desktop/share/native/libharfbuzz/hb-array.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-array.hh rename to src/java.desktop/share/native/libharfbuzz/hb-array.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic.hh b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic.hh rename to src/java.desktop/share/native/libharfbuzz/hb-atomic.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc b/src/java.desktop/share/native/libharfbuzz/hb-blob.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc rename to src/java.desktop/share/native/libharfbuzz/hb-blob.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h b/src/java.desktop/share/native/libharfbuzz/hb-blob.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h rename to src/java.desktop/share/native/libharfbuzz/hb-blob.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.hh b/src/java.desktop/share/native/libharfbuzz/hb-blob.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.hh rename to src/java.desktop/share/native/libharfbuzz/hb-blob.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-json.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh rename to src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-json.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh rename to src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc rename to src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc rename to src/java.desktop/share/native/libharfbuzz/hb-buffer.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h b/src/java.desktop/share/native/libharfbuzz/hb-buffer.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h rename to src/java.desktop/share/native/libharfbuzz/hb-buffer.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.hh rename to src/java.desktop/share/native/libharfbuzz/hb-buffer.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-common.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-common.hh rename to src/java.desktop/share/native/libharfbuzz/hb-cff-interp-common.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-cs-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-cs-common.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-cs-common.hh rename to src/java.desktop/share/native/libharfbuzz/hb-cff-interp-cs-common.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-dict-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-dict-common.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-dict-common.hh rename to src/java.desktop/share/native/libharfbuzz/hb-cff-interp-dict-common.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff1-interp-cs.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff1-interp-cs.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff1-interp-cs.hh rename to src/java.desktop/share/native/libharfbuzz/hb-cff1-interp-cs.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff2-interp-cs.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff2-interp-cs.hh rename to src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc b/src/java.desktop/share/native/libharfbuzz/hb-common.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc rename to src/java.desktop/share/native/libharfbuzz/hb-common.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h b/src/java.desktop/share/native/libharfbuzz/hb-common.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h rename to src/java.desktop/share/native/libharfbuzz/hb-common.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc b/src/java.desktop/share/native/libharfbuzz/hb-coretext.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc rename to src/java.desktop/share/native/libharfbuzz/hb-coretext.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h b/src/java.desktop/share/native/libharfbuzz/hb-coretext.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h rename to src/java.desktop/share/native/libharfbuzz/hb-coretext.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh b/src/java.desktop/share/native/libharfbuzz/hb-debug.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh rename to src/java.desktop/share/native/libharfbuzz/hb-debug.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h rename to src/java.desktop/share/native/libharfbuzz/hb-deprecated.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh b/src/java.desktop/share/native/libharfbuzz/hb-dsalgs.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh rename to src/java.desktop/share/native/libharfbuzz/hb-dsalgs.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc b/src/java.desktop/share/native/libharfbuzz/hb-face.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc rename to src/java.desktop/share/native/libharfbuzz/hb-face.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h b/src/java.desktop/share/native/libharfbuzz/hb-face.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h rename to src/java.desktop/share/native/libharfbuzz/hb-face.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.hh b/src/java.desktop/share/native/libharfbuzz/hb-face.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.hh rename to src/java.desktop/share/native/libharfbuzz/hb-face.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-fallback-shape.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc rename to src/java.desktop/share/native/libharfbuzz/hb-fallback-shape.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-font.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc rename to src/java.desktop/share/native/libharfbuzz/hb-font.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h b/src/java.desktop/share/native/libharfbuzz/hb-font.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h rename to src/java.desktop/share/native/libharfbuzz/hb-font.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.hh b/src/java.desktop/share/native/libharfbuzz/hb-font.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.hh rename to src/java.desktop/share/native/libharfbuzz/hb-font.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ft.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h b/src/java.desktop/share/native/libharfbuzz/hb-ft.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h rename to src/java.desktop/share/native/libharfbuzz/hb-ft.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-iter.hh b/src/java.desktop/share/native/libharfbuzz/hb-iter.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-iter.hh rename to src/java.desktop/share/native/libharfbuzz/hb-iter.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-kern.hh b/src/java.desktop/share/native/libharfbuzz/hb-kern.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-kern.hh rename to src/java.desktop/share/native/libharfbuzz/hb-kern.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-machinery.hh b/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-machinery.hh rename to src/java.desktop/share/native/libharfbuzz/hb-machinery.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.cc b/src/java.desktop/share/native/libharfbuzz/hb-map.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.cc rename to src/java.desktop/share/native/libharfbuzz/hb-map.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.h b/src/java.desktop/share/native/libharfbuzz/hb-map.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.h rename to src/java.desktop/share/native/libharfbuzz/hb-map.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-map.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.hh rename to src/java.desktop/share/native/libharfbuzz/hb-map.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex.hh b/src/java.desktop/share/native/libharfbuzz/hb-mutex.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex.hh rename to src/java.desktop/share/native/libharfbuzz/hb-mutex.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh b/src/java.desktop/share/native/libharfbuzz/hb-null.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh rename to src/java.desktop/share/native/libharfbuzz/hb-null.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object.hh b/src/java.desktop/share/native/libharfbuzz/hb-object.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object.hh rename to src/java.desktop/share/native/libharfbuzz/hb-object.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file.hh b/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file.hh rename to src/java.desktop/share/native/libharfbuzz/hb-open-file.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type.hh b/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type.hh rename to src/java.desktop/share/native/libharfbuzz/hb-open-type.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff-common.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cbdt-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-color-cbdt-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cbdt-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-color-cbdt-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-colr-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-color-colr-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-colr-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-color-colr-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cpal-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-color-cpal-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cpal-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-color-cpal-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-sbix-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-color-sbix-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-sbix-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-color-sbix-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-svg-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-color-svg-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-svg-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-color-svg-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-color.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-color.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-color.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot-color.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-deprecated.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-deprecated.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-deprecated.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot-deprecated.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-face.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-face.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-face.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-face.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot-font.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-gasp-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-gasp-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-gasp-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-gasp-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-glyf-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-glyf-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hdmx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hdmx-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-base-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-base-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gdef-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gdef-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-math.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot-math.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-name-language.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-name-language.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-name-language.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-name-language.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-name-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-name-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-name.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-name.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-name.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot-name.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-unicode-ranges.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-unicode-ranges.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-unicode-ranges.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-os2-unicode-ranges.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-macroman.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-macroman.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-macroman.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-post-macroman.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic-fallback.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic-fallback.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic-win1256.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic-win1256.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-arabic.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-default.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-default.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-hangul.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-hangul.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-hebrew.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-hebrew.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-indic-machine.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-indic-machine.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-indic-table.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-indic-table.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-indic.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-indic.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-indic.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-indic.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-khmer-machine.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-machine.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-khmer-machine.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-khmer.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-khmer.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-khmer.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-khmer.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-myanmar-machine.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-myanmar-machine.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-myanmar.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-myanmar.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-myanmar.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-myanmar.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-thai.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-thai.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use-machine.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use-machine.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use-table.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use-table.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-use.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-vowel-constraints.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-vowel-constraints.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-vowel-constraints.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex-vowel-constraints.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-complex.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-stat-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-stat-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-mvar-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-var-mvar-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-var.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot-var.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-vorg-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-vorg-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h b/src/java.desktop/share/native/libharfbuzz/hb-ot.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h rename to src/java.desktop/share/native/libharfbuzz/hb-ot.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest.hh b/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest.hh rename to src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc b/src/java.desktop/share/native/libharfbuzz/hb-set.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc rename to src/java.desktop/share/native/libharfbuzz/hb-set.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h b/src/java.desktop/share/native/libharfbuzz/hb-set.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h rename to src/java.desktop/share/native/libharfbuzz/hb-set.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.hh b/src/java.desktop/share/native/libharfbuzz/hb-set.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.hh rename to src/java.desktop/share/native/libharfbuzz/hb-set.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc rename to src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h rename to src/java.desktop/share/native/libharfbuzz/hb-shape-plan.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.hh b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.hh rename to src/java.desktop/share/native/libharfbuzz/hb-shape-plan.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-shape.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc rename to src/java.desktop/share/native/libharfbuzz/hb-shape.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h b/src/java.desktop/share/native/libharfbuzz/hb-shape.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h rename to src/java.desktop/share/native/libharfbuzz/hb-shape.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl.hh b/src/java.desktop/share/native/libharfbuzz/hb-shaper-impl.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl.hh rename to src/java.desktop/share/native/libharfbuzz/hb-shaper-impl.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-shaper-list.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh rename to src/java.desktop/share/native/libharfbuzz/hb-shaper-list.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc b/src/java.desktop/share/native/libharfbuzz/hb-shaper.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc rename to src/java.desktop/share/native/libharfbuzz/hb-shaper.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.hh b/src/java.desktop/share/native/libharfbuzz/hb-shaper.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.hh rename to src/java.desktop/share/native/libharfbuzz/hb-shaper.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-static.cc b/src/java.desktop/share/native/libharfbuzz/hb-static.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-static.cc rename to src/java.desktop/share/native/libharfbuzz/hb-static.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh b/src/java.desktop/share/native/libharfbuzz/hb-string-array.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh rename to src/java.desktop/share/native/libharfbuzz/hb-string-array.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.cc rename to src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh rename to src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.cc rename to src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.hh rename to src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.cc rename to src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.hh rename to src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-glyf.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.cc rename to src/java.desktop/share/native/libharfbuzz/hb-subset-glyf.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-glyf.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.hh rename to src/java.desktop/share/native/libharfbuzz/hb-subset-glyf.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.cc rename to src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-input.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.hh rename to src/java.desktop/share/native/libharfbuzz/hb-subset-input.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.cc rename to src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.hh rename to src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.cc rename to src/java.desktop/share/native/libharfbuzz/hb-subset.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.h b/src/java.desktop/share/native/libharfbuzz/hb-subset.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.h rename to src/java.desktop/share/native/libharfbuzz/hb-subset.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.hh rename to src/java.desktop/share/native/libharfbuzz/hb-subset.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc b/src/java.desktop/share/native/libharfbuzz/hb-ucdn.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc rename to src/java.desktop/share/native/libharfbuzz/hb-ucdn.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c b/src/java.desktop/share/native/libharfbuzz/hb-ucdn/ucdn.c similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c rename to src/java.desktop/share/native/libharfbuzz/hb-ucdn/ucdn.c diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h b/src/java.desktop/share/native/libharfbuzz/hb-ucdn/ucdn.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h rename to src/java.desktop/share/native/libharfbuzz/hb-ucdn/ucdn.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn_db.h b/src/java.desktop/share/native/libharfbuzz/hb-ucdn/ucdn_db.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn_db.h rename to src/java.desktop/share/native/libharfbuzz/hb-ucdn/ucdn_db.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-emoji-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-emoji-table.hh rename to src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc b/src/java.desktop/share/native/libharfbuzz/hb-unicode.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc rename to src/java.desktop/share/native/libharfbuzz/hb-unicode.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h b/src/java.desktop/share/native/libharfbuzz/hb-unicode.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h rename to src/java.desktop/share/native/libharfbuzz/hb-unicode.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.hh b/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.hh rename to src/java.desktop/share/native/libharfbuzz/hb-unicode.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf.hh b/src/java.desktop/share/native/libharfbuzz/hb-utf.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf.hh rename to src/java.desktop/share/native/libharfbuzz/hb-utf.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-vector.hh b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-vector.hh rename to src/java.desktop/share/native/libharfbuzz/hb-vector.hh diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h b/src/java.desktop/share/native/libharfbuzz/hb-version.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h rename to src/java.desktop/share/native/libharfbuzz/hb-version.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc b/src/java.desktop/share/native/libharfbuzz/hb-warning.cc similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc rename to src/java.desktop/share/native/libharfbuzz/hb-warning.cc diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h b/src/java.desktop/share/native/libharfbuzz/hb.h similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h rename to src/java.desktop/share/native/libharfbuzz/hb.h diff --git a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh b/src/java.desktop/share/native/libharfbuzz/hb.hh similarity index 100% rename from src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh rename to src/java.desktop/share/native/libharfbuzz/hb.hh