going to tidy this up

Author: coffeebe4code

build.zig

@@ -1,8 +1,6 @@
 const std = @import("std");
 const androidbuild = @import("src/androidbuild/androidbuild.zig");
 
-// Expose Android build functionality for use in your build.zig
-
 // TODO: rename tools.zig to Sdk.zig
 pub const Sdk = @import("src/androidbuild/tools.zig");
 pub const Apk = @import("src/androidbuild/apk.zig");

examples/minimal/android/assets/assets/hello_android.txt

@@ -0,0 +1 @@
+hello from android

examples/minimal/android/assets/hello_android.txt

@@ -0,0 +1 @@
+hello android!

examples/minimal/build.zig

@@ -27,6 +27,7 @@ pub fn build(b: *std.Build) void {
         apk.setKeyStore(key_store_file);
         apk.setAndroidManifest(b.path("android/AndroidManifest.xml"));
         apk.addResourceDirectory(b.path("android/res"));
+        apk.addAssetsDirectory(b.path("android/assets"));
 
         // Add Java files
         // - If you have 'android:hasCode="false"' in your AndroidManifest.xml then no Java files are required

examples/minimal/src/android-bind.zig

@@ -1,7 +1,3 @@
-// TODO(jae): 2024-09-19
-// Consider just making this import from native C libraries.
-// For now just wanted a basic example that compiles and runs on an Android emulator
-
 const __builtin_va_list = extern struct {
     padding: u32,
 };

examples/sdl2/android/AndroidManifest.xml

@@ -4,22 +4,11 @@
     android:versionName="1.0"
     android:installLocation="auto"
     package="com.zig.sdl2">
-    <!-- 
-        Based on:
-        https://github.com/libsdl-org/SDL/blob/release-2.30.7/android-project/app/src/main/AndroidManifest.xml
-    -->
-
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="35" />
-
-    <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" />
-
-    <!-- Touchscreen support -->
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
-
-    <!-- Game controller support -->
     <uses-feature
         android:name="android.hardware.bluetooth"
         android:required="false" />
@@ -29,50 +18,19 @@
     <uses-feature
         android:name="android.hardware.usb.host"
         android:required="false" />
-
-    <!-- External mouse input events -->
     <uses-feature
         android:name="android.hardware.type.pc"
         android:required="false" />
-
-    <!-- Audio recording support -->
-    <!-- if you want to capture audio, uncomment this. -->
-    <!-- <uses-feature
-        android:name="android.hardware.microphone"
-        android:required="false" /> -->
-
-    <!-- Allow downloading to the external storage on Android 5.1 and older -->
-    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="22" /> -->
-
-    <!-- Allow access to Bluetooth devices -->
-    <!-- Currently this is just for Steam Controller support and requires setting SDL_HINT_JOYSTICK_HIDAPI_STEAM -->
-    <!-- <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" /> -->
-    <!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /> -->
-
-    <!-- Allow access to the vibrator -->
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.VIBRATE" />
-
-    <!-- if you want to capture audio, uncomment this. -->
-    <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
-
-    <!-- Create a Java class extending SDLActivity and place it in a
-         directory under app/src/main/java matching the package, e.g. app/src/main/java/com/gamemaker/game/MyGame.java
- 
-         then replace "SDLActivity" with the name of your class (e.g. "MyGame")
-         in the XML below.
-
-         An example Java class can be found in README-android.md
-    -->
     <application android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="true"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
         android:hardwareAccelerated="true" >
 
-        <!-- Example of setting SDL hints from AndroidManifest.xml:
         <meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0"/>
-         -->
-     
         <activity android:name="ZigSDLActivity"
             android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
@@ -85,18 +43,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <!-- Let Android know that we can handle some USB devices and should receive this event -->
-            <!-- <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-            </intent-filter> -->
-            <!-- Drop file event -->
-            <!--
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="*/*" />
-            </intent-filter>
-            -->
         </activity>
     </application>
 

src/android/android.zig

@@ -1,10 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
 
-// TODO(jae): 2024-10-03
-// Consider exposing this in the future
-// pub const builtin = android_builtin;
-
 const android_builtin = struct {
     const ab = @import("android_builtin");
 

src/androidbuild/apk.zig

@@ -358,6 +358,7 @@ fn doInstallApk(apk: *Apk) std.mem.Allocator.Error!*Step.InstallFile {
             const val = dir.src_path.sub_path;
 
             aapt2link.addArg(val);
+            //aapt2link.addFileInput(dir);
         }
 
         // Add resource files