From 5efe6237984f379fabe91da3e8169c3bf1fd97d0 Mon Sep 17 00:00:00 2001 From: Jae B Date: Sun, 12 Jul 2026 14:17:01 +1000 Subject: [PATCH 1/2] document build_tools_version, ndk_version and api_level to explain what they are for --- src/androidbuild/Apk.zig | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/androidbuild/Apk.zig b/src/androidbuild/Apk.zig index 29bf7d9..2dfd585 100644 --- a/src/androidbuild/Apk.zig +++ b/src/androidbuild/Apk.zig @@ -59,11 +59,16 @@ assets: ArrayList(Resource), pub const Options = struct { /// APK file output name, ie. "{name}.apk" name: []const u8, - /// ie. "35.0.0" + /// "37.0.0" will use "$ANDROID_HOME/build-tools/37.0.0" which contains tools like: + /// "aapt2", "zipalign", "apksigner", "d8" build_tools_version: []const u8, - /// ie. "27.0.12077973" + /// "27.0.12077973" will is used to access: + /// - Include headers: $ANDROID_HOME/ndk/27.0.12077973/toolchains/llvm/prebuilt/YOUR_HOST_OS_HERE/sysroot/usr/include + /// - System libraries: $ANDROID_HOME/ndk/27.0.12077973/toolchains/llvm/prebuilt/YOUR_HOST_OS_HERE/sysroot/usr/lib ndk_version: []const u8, - /// ie. .android15 = 35 (android 15 uses API version 35) + /// .android15 = 35 (android 15 uses API version 35) decides on: + /// - System libraries: $ANDROID_HOME/ndk/$NDK_VERSION/toolchains/llvm/prebuilt/$HOST_OS/sysroot/usr/lib/$TARGET_ARCH/$ANDROID_API_LEVEL + /// - Platform tool jar: $ANDROID_HOME/platforms/android-ANDROID_API_LEVEL api_level: ApiLevel, }; From 3ac399402c4a7f897667a34b72f210c141570cef Mon Sep 17 00:00:00 2001 From: Jae B Date: Sun, 12 Jul 2026 14:18:37 +1000 Subject: [PATCH 2/2] add android17 cinnamon bun --- src/androidbuild/androidbuild.zig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/androidbuild/androidbuild.zig b/src/androidbuild/androidbuild.zig index cc5680b..6e6b7e2 100644 --- a/src/androidbuild/androidbuild.zig +++ b/src/androidbuild/androidbuild.zig @@ -39,6 +39,8 @@ pub const ApiLevel = enum(u32) { android15 = 35, /// Baklava android16 = 36, + /// Cinnamon Bun + android17 = 37, // allow custom overrides (incase this library is not up to date with the latest android version) _, };