more touch ups

Author: silbinarywolf

examples/minimal/README.md

@@ -2,6 +2,13 @@
 
 As of 2024-09-19, this is a thrown together, very quick copy-paste of the minimal example from the original [ZigAndroidTemplate](https://github.com/ikskuh/ZigAndroidTemplate/blob/master/examples/minimal/main.zig) repository.
 
+### Build and run natively on your operating system or install/run on Android device
+
+```sh
+zig build run           # Native
+zig build run -Dandroid # Android
+```
+
 ### Build, install to test one target against a local emulator and run
 
 ```sh
@@ -13,7 +20,7 @@ adb shell am start -S -W -n com.zig.minimal/android.app.NativeActivity
 ### Build and install for all supported Android targets
 
 ```sh
-zig build -Dandroid=true
+zig build -Dandroid
 adb install ./zig-out/bin/minimal.apk
 ```
 

examples/raylib/README.md

@@ -7,6 +7,13 @@ ld.lld: warning: <path-to-project>/.zig-cache/o/4227869d730f094811a7cdaaab535797
 ```
 You can ignore this error for now.
 
+### Build and run natively on your operating system or install/run on Android device
+
+```sh
+zig build run           # Native
+zig build run -Dandroid # Android
+```
+
 ### Build, install to test one target against a local emulator and run
 
 ```sh
@@ -18,16 +25,10 @@ adb shell am start -S -W -n com.zig.raylib/android.app.NativeActivity
 ### Build and install for all supported Android targets
 
 ```sh
-zig build -Dandroid=true
+zig build -Dandroid
 adb install ./zig-out/bin/raylib.apk
 ```
 
-### Build and run natively on your operating system
-
-```sh
-zig build run
-```
-
 ### Uninstall your application
 
 If installing your application fails with something like:

examples/sdl2/README.md

@@ -2,6 +2,13 @@
 
 This is a copy-paste of [Andrew Kelly's SDL Zig Demo](https://github.com/andrewrk/sdl-zig-demo) but running on Android. The build is setup so you can also target your native operating system as well.
 
+### Build and run natively on your operating system or install/run on Android device
+
+```sh
+zig build run           # Native
+zig build run -Dandroid # Android
+```
+
 ### Build, install to test one target against a local emulator and run
 
 ```sh
@@ -17,12 +24,6 @@ zig build -Dandroid=true
 adb install ./zig-out/bin/sdl-zig-demo.apk
 ```
 
-### Build and run natively on your operating system
-
-```sh
-zig build run
-```
-
 ### Uninstall your application
 
 If installing your application fails with something like:

src/androidbuild/tools.zig

@@ -1,6 +1,7 @@
 const std = @import("std");
 const builtin = @import("builtin");
 const androidbuild = @import("androidbuild.zig");
+const Allocator = std.mem.Allocator;
 
 /// Used for reading install locations from the registry
 const RegistryWtf8 = @import("WindowsSdk.zig").RegistryWtf8;
@@ -378,39 +379,39 @@ pub fn createOrGetLibCFile(tools: *Sdk, compile: *Step.Compile, android_api_leve
 
 /// Search JDK_HOME, and then JAVA_HOME
 fn getJDKPath(allocator: std.mem.Allocator) error{OutOfMemory}![]const u8 {
-    const jdkHome = std.process.getEnvVarOwned(allocator, "JDK_HOME") catch |err| switch (err) {
+    const jdk_home = std.process.getEnvVarOwned(allocator, "JDK_HOME") catch |err| switch (err) {
         error.OutOfMemory => return error.OutOfMemory,
         error.EnvironmentVariableNotFound => &[0]u8{},
         // Windows-only
         error.InvalidWtf8 => @panic("JDK_HOME environment variable is invalid UTF-8"),
     };
-    if (jdkHome.len > 0) {
-        return jdkHome;
+    if (jdk_home.len > 0) {
+        return jdk_home;
     }
 
-    const javaHome = std.process.getEnvVarOwned(allocator, "JAVA_HOME") catch |err| switch (err) {
+    const java_home = std.process.getEnvVarOwned(allocator, "JAVA_HOME") catch |err| switch (err) {
         error.OutOfMemory => return error.OutOfMemory,
         error.EnvironmentVariableNotFound => &[0]u8{},
         // Windows-only
         error.InvalidWtf8 => @panic("JAVA_HOME environment variable is invalid UTF-8"),
     };
-    if (javaHome.len > 0) {
-        return javaHome;
+    if (java_home.len > 0) {
+        return java_home;
     }
 
     return &[0]u8{};
 }
 
 /// Caller must free returned memory
 fn getAndroidSDKPath(allocator: std.mem.Allocator) error{OutOfMemory}![]const u8 {
-    const androidHome = std.process.getEnvVarOwned(allocator, "ANDROID_HOME") catch |err| switch (err) {
+    const android_home = std.process.getEnvVarOwned(allocator, "ANDROID_HOME") catch |err| switch (err) {
         error.OutOfMemory => return error.OutOfMemory,
         error.EnvironmentVariableNotFound => &[0]u8{},
         // Windows-only
         error.InvalidWtf8 => @panic("ANDROID_HOME environment variable is invalid UTF-8"),
     };
-    if (androidHome.len > 0) {
-        return androidHome;
+    if (android_home.len > 0) {
+        return android_home;
     }
 
     // Check for Android Studio
@@ -567,8 +568,8 @@ const PathSearch = struct {
 
         // setup binaries to search for
         const exe_suffix = if (host_os_tag == .windows) ".exe" else "";
-        const adb = std.mem.concat(allocator, u8, &.{ "adb", exe_suffix }) catch |err| return err;
-        const jarsigner = std.mem.concat(allocator, u8, &.{ "jarsigner", exe_suffix }) catch |err| return err;
+        const adb = try std.mem.concat(allocator, u8, &.{ "adb", exe_suffix });
+        const jarsigner = try std.mem.concat(allocator, u8, &.{ "jarsigner", exe_suffix });
 
         const path_it = std.mem.splitScalar(u8, path_env, ';');
         return .{
@@ -586,7 +587,7 @@ const PathSearch = struct {
     }
 
     /// Get the Android SDK Path, the caller owns the memory
-    pub fn findAndroidSDK(self: *PathSearch, allocator: std.mem.Allocator) error{OutOfMemory}![]const u8 {
+    pub fn findAndroidSDK(self: *PathSearch, allocator: std.mem.Allocator) Allocator.Error![]const u8 {
         if (self.android_sdk_path == null) {
             // Iterate over PATH environment folders until we either hit the end or the Android SDK folder
             try self.getNext(.androidsdk);
@@ -598,7 +599,7 @@ const PathSearch = struct {
     }
 
     /// Get the JDK Path, the caller owns the memory
-    pub fn findJDK(self: *PathSearch, allocator: std.mem.Allocator) error{OutOfMemory}![]const u8 {
+    pub fn findJDK(self: *PathSearch, allocator: std.mem.Allocator) Allocator.Error![]const u8 {
         if (self.jdk_path == null) {
             // Iterate over PATH environment folders until we either hit the end or the Android SDK folder
             try self.getNext(.jdk);
@@ -614,7 +615,7 @@ const PathSearch = struct {
         jdk,
     };
 
-    fn getNext(self: *PathSearch, path: PathType) error{OutOfMemory}!void {
+    fn getNext(self: *PathSearch, path: PathType) Allocator.Error!void {
         const allocator = self.allocator;
         while (self.path_it.next()) |path_item| {
             if (path_item.len == 0) continue;