more work

Author: silbinarywolf

build.zig

@@ -6,11 +6,13 @@ const androidbuild = @import("src/androidbuild/androidbuild.zig");
 // TODO: rename tools.zig to Sdk.zig
 pub const Sdk = @import("src/androidbuild/tools.zig");
 pub const Apk = @import("src/androidbuild/apk.zig");
-pub const APILevel = androidbuild.APILevel; // TODO(jae): 2025-03-13: Consider deprecating and using 'ApiLevel' to be conventional to Zig
+pub const ApiLevel = androidbuild.ApiLevel;
 pub const standardTargets = androidbuild.standardTargets;
 
-// Deprecated exposes fields
+// Deprecated exposed fields
 
+/// Deprecated: Use ApiLevel
+pub const APILevel = @compileError("use android.ApiLevel instead of android.APILevel");
 /// Deprecated: Use Sdk instead
 pub const Tools = @compileError("Use android.Sdk instead of android.Tools");
 /// Deprecated: Use Apk.Options instead.

src/androidbuild/androidbuild.zig

@@ -7,9 +7,6 @@ const LazyPath = std.Build.LazyPath;
 
 const log = std.log.scoped(.@"zig-android-sdk");
 
-/// Deprecated: Use ApiLevel
-pub const APILevel = ApiLevel;
-
 /// API Level is an enum the maps the Android OS version to the API level
 ///
 /// https://en.wikipedia.org/wiki/Android_version_history
@@ -47,11 +44,6 @@ pub const ApiLevel = enum(u32) {
     _,
 };
 
-pub const KeyStore = struct {
-    file: LazyPath,
-    password: []const u8,
-};
-
 pub fn getAndroidTriple(target: ResolvedTarget) error{InvalidAndroidTarget}![]const u8 {
     if (!target.result.abi.isAndroid()) return error.InvalidAndroidTarget;
     return switch (target.result.cpu.arch) {

src/androidbuild/apk.zig

@@ -7,8 +7,8 @@ const Ndk = @import("Ndk.zig");
 const BuildTools = @import("BuildTools.zig");
 const D8Glob = @import("d8glob.zig");
 
+const KeyStore = Tools.KeyStore;
 const ApiLevel = androidbuild.ApiLevel;
-const KeyStore = androidbuild.KeyStore;
 const getAndroidTriple = androidbuild.getAndroidTriple;
 const runNameContext = androidbuild.runNameContext;
 const printErrorsAndExit = androidbuild.printErrorsAndExit;
@@ -150,7 +150,7 @@ pub fn addJavaSourceFiles(apk: *Apk, options: AddJavaSourceFilesOptions) void {
 /// This is required run on an Android device.
 ///
 /// If you want to just use a temporary key for local development, do something like this:
-/// - apk.setKeyStore(android_tools.createKeyStore(android.CreateKey.example()));
+/// - apk.setKeyStore(android_sdk.createKeyStore(.example);
 pub fn setKeyStore(apk: *Apk, key_store: KeyStore) void {
     apk.key_store = key_store;
 }
@@ -205,10 +205,7 @@ pub fn addInstallApk(apk: *Apk) *Step.InstallFile {
 fn doInstallApk(apk: *Apk) std.mem.Allocator.Error!*Step.InstallFile {
     const b = apk.b;
 
-    const key_store: KeyStore = apk.key_store orelse .{
-        .file = .{ .cwd_relative = "" },
-        .password = "",
-    };
+    const key_store: KeyStore = apk.key_store orelse .empty;
 
     // validate
     {

src/androidbuild/tools.zig

@@ -7,7 +7,6 @@ const RegistryWtf8 = @import("WindowsSdk.zig").RegistryWtf8;
 const windows = std.os.windows;
 
 const ApiLevel = androidbuild.ApiLevel;
-const KeyStore = androidbuild.KeyStore;
 const getAndroidTriple = androidbuild.getAndroidTriple;
 const runNameContext = androidbuild.runNameContext;
 const printErrorsAndExit = androidbuild.printErrorsAndExit;
@@ -460,6 +459,16 @@ fn getAndroidSDKPath(allocator: std.mem.Allocator) error{OutOfMemory}![]const u8
     return &[0]u8{};
 }
 
+pub const KeyStore = struct {
+    file: LazyPath,
+    password: []const u8,
+
+    pub const empty: KeyStore = .{
+        .file = .{ .cwd_relative = "" },
+        .password = "",
+    };
+};
+
 /// Searches your PATH environment variable directories for adb, jarsigner, etc
 const PathSearch = struct {
     allocator: std.mem.Allocator,