From 5890ade69926764fbdd382b22725fee435ffc766 Mon Sep 17 00:00:00 2001 From: Elliot Wolk Date: Mon, 20 Jul 2026 10:16:54 -0400 Subject: [PATCH 1/2] thirdparty: add missing src files for upgraded libs to android --- .../app/thirdparty_libs/freetype/Android.mk | 1 + .../thirdparty_libs/freetype/CMakeLists.txt | 1 + .../app/thirdparty_libs/harfbuzz/Android.mk | 31 ++++++++++++------- .../thirdparty_libs/harfbuzz/CMakeLists.txt | 16 ++++++++++ .../thirdparty_libs/libunibreak/Android.mk | 1 + .../libunibreak/CMakeLists.txt | 1 + android/app/thirdparty_libs/zstd/Android.mk | 1 + .../app/thirdparty_libs/zstd/CMakeLists.txt | 1 + 8 files changed, 41 insertions(+), 12 deletions(-) diff --git a/android/app/thirdparty_libs/freetype/Android.mk b/android/app/thirdparty_libs/freetype/Android.mk index a86c1e377e..1c4a937f36 100644 --- a/android/app/thirdparty_libs/freetype/Android.mk +++ b/android/app/thirdparty_libs/freetype/Android.mk @@ -29,6 +29,7 @@ LOCAL_SRC_FILES := \ $(FREETYPE_SRC_DIR)/src/base/ftdebug.c \ $(FREETYPE_SRC_DIR)/src/base/ftinit.c \ $(FREETYPE_SRC_DIR)/src/base/ftfntfmt.c \ + $(FREETYPE_SRC_DIR)/src/base/ftmm.c \ $(FREETYPE_SRC_DIR)/src/base/ftsystem.c \ $(FREETYPE_SRC_DIR)/src/base/ftglyph.c \ $(FREETYPE_SRC_DIR)/src/base/ftbitmap.c \ diff --git a/android/app/thirdparty_libs/freetype/CMakeLists.txt b/android/app/thirdparty_libs/freetype/CMakeLists.txt index 9dd473c036..97809ac189 100644 --- a/android/app/thirdparty_libs/freetype/CMakeLists.txt +++ b/android/app/thirdparty_libs/freetype/CMakeLists.txt @@ -15,6 +15,7 @@ set(FREETYPE_SRC_FILES ${FREETYPE_SRC_DIR}/src/base/ftdebug.c ${FREETYPE_SRC_DIR}/src/base/ftinit.c ${FREETYPE_SRC_DIR}/src/base/ftfntfmt.c + ${FREETYPE_SRC_DIR}/src/base/ftmm.c ${FREETYPE_SRC_DIR}/src/base/ftsystem.c ${FREETYPE_SRC_DIR}/src/base/ftglyph.c ${FREETYPE_SRC_DIR}/src/base/ftbitmap.c diff --git a/android/app/thirdparty_libs/harfbuzz/Android.mk b/android/app/thirdparty_libs/harfbuzz/Android.mk index f8f26c9025..e05f4fbc14 100644 --- a/android/app/thirdparty_libs/harfbuzz/Android.mk +++ b/android/app/thirdparty_libs/harfbuzz/Android.mk @@ -20,19 +20,26 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H=1 LOCAL_CFLAGS += -funwind-tables -Wl,--no-merge-exidx-entries LOCAL_SRC_FILES := \ + $(HARFBUZZ_SRC_DIR)/src/OT/Var/VARC/VARC.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-aat-layout.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-aat-map.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-blob.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-buffer.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-buffer-serialize.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-buffer-verify.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-common.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-draw.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-face.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-face-builder.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-fallback-shape.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-font.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-paint.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-paint-extents.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-paint-bounded.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ft.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-map.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-number.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-outline.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-cff1-table.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-cff2-table.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-color.cc \ @@ -44,18 +51,18 @@ LOCAL_SRC_FILES := \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-meta.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-metrics.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-name.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-arabic.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-default.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-hangul.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-hebrew.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-indic-table.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-khmer.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-myanmar.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-syllabic.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-thai.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-use.cc \ - $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-complex-vowel-constraints.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-arabic.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-default.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-hangul.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-hebrew.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-indic.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-indic-table.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-khmer.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-myanmar.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-syllabic.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-thai.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-use.cc \ + $(HARFBUZZ_SRC_DIR)/src/hb-ot-shaper-vowel-constraints.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-fallback.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape-normalize.cc \ $(HARFBUZZ_SRC_DIR)/src/hb-ot-shape.cc \ diff --git a/android/app/thirdparty_libs/harfbuzz/CMakeLists.txt b/android/app/thirdparty_libs/harfbuzz/CMakeLists.txt index 530de18d14..ae4ce21b5f 100644 --- a/android/app/thirdparty_libs/harfbuzz/CMakeLists.txt +++ b/android/app/thirdparty_libs/harfbuzz/CMakeLists.txt @@ -10,6 +10,7 @@ include_directories(${HARFBUZZ_CONFIG_DIR}) add_definitions(-DHAVE_CONFIG_H=1) set(HARFBUZZ_SRC_FILES + ${HARFBUZZ_SRC_DIR}/src/OT/Var/VARC/VARC.cc ${HARFBUZZ_SRC_DIR}/src/hb-aat-layout.cc ${HARFBUZZ_SRC_DIR}/src/hb-aat-map.cc ${HARFBUZZ_SRC_DIR}/src/hb-blob.cc @@ -22,6 +23,9 @@ set(HARFBUZZ_SRC_FILES ${HARFBUZZ_SRC_DIR}/src/hb-face-builder.cc ${HARFBUZZ_SRC_DIR}/src/hb-fallback-shape.cc ${HARFBUZZ_SRC_DIR}/src/hb-font.cc + ${HARFBUZZ_SRC_DIR}/src/hb-paint.cc + ${HARFBUZZ_SRC_DIR}/src/hb-paint-extents.cc + ${HARFBUZZ_SRC_DIR}/src/hb-paint-bounded.cc ${HARFBUZZ_SRC_DIR}/src/hb-ft.cc ${HARFBUZZ_SRC_DIR}/src/hb-map.cc ${HARFBUZZ_SRC_DIR}/src/hb-number.cc @@ -37,6 +41,18 @@ set(HARFBUZZ_SRC_FILES ${HARFBUZZ_SRC_DIR}/src/hb-ot-meta.cc ${HARFBUZZ_SRC_DIR}/src/hb-ot-metrics.cc ${HARFBUZZ_SRC_DIR}/src/hb-ot-name.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-arabic.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-default.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-hangul.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-hebrew.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-indic.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-indic-table.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-khmer.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-myanmar.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-syllabic.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-thai.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-use.cc + ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-vowel-constraints.cc ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-fallback.cc ${HARFBUZZ_SRC_DIR}/src/hb-ot-shape-normalize.cc ${HARFBUZZ_SRC_DIR}/src/hb-ot-shaper-default.cc diff --git a/android/app/thirdparty_libs/libunibreak/Android.mk b/android/app/thirdparty_libs/libunibreak/Android.mk index c10a1ca2ea..1ec389999c 100644 --- a/android/app/thirdparty_libs/libunibreak/Android.mk +++ b/android/app/thirdparty_libs/libunibreak/Android.mk @@ -17,6 +17,7 @@ LOCAL_SRC_FILES := \ $(LIBUNIBREAK_SRC_DIR)/linebreak.c \ $(LIBUNIBREAK_SRC_DIR)/linebreakdata.c \ $(LIBUNIBREAK_SRC_DIR)/linebreakdef.c \ + $(LIBUNIBREAK_SRC_DIR)/eastasianwidthdata.c \ $(LIBUNIBREAK_SRC_DIR)/emojidef.c \ $(LIBUNIBREAK_SRC_DIR)/graphemebreak.c \ $(LIBUNIBREAK_SRC_DIR)/wordbreak.c diff --git a/android/app/thirdparty_libs/libunibreak/CMakeLists.txt b/android/app/thirdparty_libs/libunibreak/CMakeLists.txt index 45b964301e..ff356a61ad 100644 --- a/android/app/thirdparty_libs/libunibreak/CMakeLists.txt +++ b/android/app/thirdparty_libs/libunibreak/CMakeLists.txt @@ -12,6 +12,7 @@ set(LIBUNIBREAK_SOURCE ${LIBUNIBREAK_SOURCE_DIR}/linebreak.c ${LIBUNIBREAK_SOURCE_DIR}/linebreakdata.c ${LIBUNIBREAK_SOURCE_DIR}/linebreakdef.c + ${LIBUNIBREAK_SOURCE_DIR}/eastasianwidthdata.c ${LIBUNIBREAK_SOURCE_DIR}/emojidef.c ${LIBUNIBREAK_SOURCE_DIR}/graphemebreak.c ${LIBUNIBREAK_SOURCE_DIR}/wordbreak.c diff --git a/android/app/thirdparty_libs/zstd/Android.mk b/android/app/thirdparty_libs/zstd/Android.mk index 6e500020d1..da9f6a5812 100644 --- a/android/app/thirdparty_libs/zstd/Android.mk +++ b/android/app/thirdparty_libs/zstd/Android.mk @@ -34,6 +34,7 @@ LOCAL_SRC_FILES := \ $(ZSTD_SRC_DIR)/lib/compress/zstd_lazy.c \ $(ZSTD_SRC_DIR)/lib/compress/zstd_ldm.c \ $(ZSTD_SRC_DIR)/lib/compress/zstd_opt.c \ + $(ZSTD_SRC_DIR)/lib/compress/zstd_preSplit.c \ $(ZSTD_SRC_DIR)/lib/compress/zstdmt_compress.c \ $(ZSTD_SRC_DIR)/lib/decompress/huf_decompress.c \ $(ZSTD_SRC_DIR)/lib/decompress/zstd_ddict.c \ diff --git a/android/app/thirdparty_libs/zstd/CMakeLists.txt b/android/app/thirdparty_libs/zstd/CMakeLists.txt index 6b8efff5fd..4eb0a7c35a 100644 --- a/android/app/thirdparty_libs/zstd/CMakeLists.txt +++ b/android/app/thirdparty_libs/zstd/CMakeLists.txt @@ -41,6 +41,7 @@ set(ZSTD_SRC_FILES ${ZSTD_SRC_DIR}/lib/compress/zstd_lazy.c ${ZSTD_SRC_DIR}/lib/compress/zstd_ldm.c ${ZSTD_SRC_DIR}/lib/compress/zstd_opt.c + ${ZSTD_SRC_DIR}/lib/compress/zstd_preSplit.c ${ZSTD_SRC_DIR}/lib/compress/zstdmt_compress.c ${ZSTD_SRC_DIR}/lib/compress/zstd_preSplit.c ${ZSTD_SRC_DIR}/lib/decompress/huf_decompress.c From 50d0468bfc0ef671afb48323c1078386d5fdc6ba Mon Sep 17 00:00:00 2001 From: Elliot Wolk Date: Mon, 20 Jul 2026 10:19:56 -0400 Subject: [PATCH 2/2] thirdparty: update android 3rd party version defns --- android/app/thirdparty_libs/fribidi/config.h | 4 ++-- android/app/thirdparty_libs/harfbuzz/config.h | 4 ++-- android/app/thirdparty_libs/libpng/config.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/thirdparty_libs/fribidi/config.h b/android/app/thirdparty_libs/fribidi/config.h index bad36e090e..8c17516a00 100644 --- a/android/app/thirdparty_libs/fribidi/config.h +++ b/android/app/thirdparty_libs/fribidi/config.h @@ -68,7 +68,7 @@ #define PACKAGE_NAME "GNU FriBidi" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU FriBidi 1.0.10" +#define PACKAGE_STRING "GNU FriBidi 1.0.16" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "fribidi" @@ -77,7 +77,7 @@ #define PACKAGE_URL "http://fribidi.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.10" +#define PACKAGE_VERSION "1.0.16" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void diff --git a/android/app/thirdparty_libs/harfbuzz/config.h b/android/app/thirdparty_libs/harfbuzz/config.h index 60d6d7452b..6288fcee3b 100644 --- a/android/app/thirdparty_libs/harfbuzz/config.h +++ b/android/app/thirdparty_libs/harfbuzz/config.h @@ -134,7 +134,7 @@ #define PACKAGE_NAME "HarfBuzz" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.8.0" +#define PACKAGE_STRING "HarfBuzz 14.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "harfbuzz" @@ -143,7 +143,7 @@ #define PACKAGE_URL "http://harfbuzz.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.8.0" +#define PACKAGE_VERSION "14.2.1" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ diff --git a/android/app/thirdparty_libs/libpng/config.h b/android/app/thirdparty_libs/libpng/config.h index 7d4d708cf7..8b8d3ddf3c 100644 --- a/android/app/thirdparty_libs/libpng/config.h +++ b/android/app/thirdparty_libs/libpng/config.h @@ -56,7 +56,7 @@ #define PACKAGE_NAME "libpng" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libpng 1.6.37" +#define PACKAGE_STRING "libpng 1.6.58" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libpng" @@ -65,7 +65,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6.37" +#define PACKAGE_VERSION "1.6.58" /* Turn on ARM Neon optimizations at run-time */ /* #undef PNG_ARM_NEON_API_SUPPORTED */ @@ -104,7 +104,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "1.6.37" +#define VERSION "1.6.58" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */