rust-mobile · MarijnS95 · Aug 16, 2023 · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023
diff --git a/ndk-sys/CHANGELOG.md b/ndk-sys/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Unreleased
 
 - **Breaking:** Regenerate against NDK `25.2.9519653` with `rust-bindgen 0.66.0`. (#324, #370)
+- Add `font`, `font_matcher`, `system_fonts` bindings. (#397)
 
 # 0.4.1 (2022-11-23)
 

diff --git a/ndk-sys/generate_bindings.sh b/ndk-sys/generate_bindings.sh
@@ -1,6 +1,16 @@
 #!/bin/sh
 
-sysroot="${ANDROID_NDK_ROOT}"/toolchains/llvm/prebuilt/linux-x86_64/sysroot/
+os=$(uname -s)
+
+if [[ "$os" == "Darwin" ]]; then
+    host_tag="darwin-x86_64"
+elif [[ "$os" == "CYGWIN"* ]]; then
+    host_tag="windows-x86_64"
+else
+    host_tag="linux-x86_64"
+fi
+
+sysroot="${ANDROID_NDK_ROOT}"/toolchains/llvm/prebuilt/${host_tag}/sysroot/
 [ ! -d "$sysroot" ] && echo "Android sysroot $sysroot does not exist!" && exit 1
 
 while read ARCH && read TARGET ; do

diff --git a/ndk-sys/src/ffi_aarch64.rs b/ndk-sys/src/ffi_aarch64.rs
diff --git a/ndk-sys/src/ffi_arm.rs b/ndk-sys/src/ffi_arm.rs
diff --git a/ndk-sys/src/ffi_i686.rs b/ndk-sys/src/ffi_i686.rs
diff --git a/ndk-sys/src/ffi_x86_64.rs b/ndk-sys/src/ffi_x86_64.rs
diff --git a/ndk-sys/wrapper.h b/ndk-sys/wrapper.h
@@ -20,8 +20,12 @@
 #include <android/dlext.h>
 #include <android/fdsan.h>
 #include <android/file_descriptor_jni.h>
-// #include <android/font.h>
-// #include <android/font_matcher.h>
+// <android/font.h> is broken without the following typedef in C
+typedef struct AFont AFont;
+#include <android/font.h>
+// <android/font_matcher.h> is broken without the following typedef in C
+typedef struct AFontMatcher AFontMatcher;
+#include <android/font_matcher.h>
 #include <android/hardware_buffer.h>
 #include <android/hardware_buffer_jni.h>
 #include <android/hdr_metadata.h>
@@ -49,7 +53,9 @@
 #include <android/surface_texture.h>
 #include <android/surface_texture_jni.h>
 #include <android/sync.h>
-// #include <android/system_fonts.h>
+// <android/system_fonts.h> is broken without the following typedef in C
+typedef struct ASystemFontIterator ASystemFontIterator;
+#include <android/system_fonts.h>
 // #include <android/thermal.h>
 #include <android/trace.h>
 #include <android/versioning.h>

diff --git a/ndk/CHANGELOG.md b/ndk/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Bump optional `jni` dependency for doctest example from `0.19` to `0.21`. (#390)
 - **Breaking:** Upgrade to [`ndk-sys 0.5.0`](../ndk-sys/CHANGELOG.md#050-TODO). (#370)
 - **Breaking:** Upgrade `bitflags` crate from `1` to `2`. (#394)
+- Add `Font` bindings. (#397)
 - **Breaking:** Upgrade `num_enum` crate from `0.5.1` to `0.6`. (#398)
 - **Breaking:** Renamed and moved "`media`" error types and helpers to a new `media_error` module. (#399)
 - **Breaking:** media_codec: Wrap common dequeued-buffer status codes in enum. (#401)