Merge remote-tracking branch 'refs/remotes/origin/main'

2025-06-22 03:54:44 +01:00
parent 808b51ff5f c7322d8171
commit 2b777f55c7
16 changed files with 539 additions and 440 deletions
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-model href="http://schemas.android.com/apk/res/android"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.dsa.emulator"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="35" />
+    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application
+        android:label="DSA Emulator"
+        android:icon="@mipmap/ic_launcher"
+        android:hasCode="false"
+        android:hardwareAccelerated="true">
+        <activity
+            android:name="android.app.NativeActivity"
+            android:label="DSA Emulator"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="unspecified"
+            android:launchMode="singleInstance">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="dsa_rs" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
@@ -0,0 +1,74 @@
+#!/usr/bin/env pwsh
+
+$env:ANDROID_HOME = "C:\Users\jacob\AppData\Local\Android\Sdk"
+$TOOL_PREFIX = "$env:ANDROID_HOME\build-tools\35.0.1"
+
+# Only really works on Windows, for aarch64.
+
+# Create directories
+New-Item -ItemType Directory -Force -Path "..\target\apk_build\lib\arm64-v8a"
+New-Item -ItemType Directory -Force -Path "..\target\apk_build\res\values"
+New-Item -ItemType Directory -Force -Path "..\target\apk_build\res\mipmap-hdpi"
+New-Item -ItemType Directory -Force -Path "..\target\apk_build\res\mipmap-mdpi"
+New-Item -ItemType Directory -Force -Path "..\target\apk_build\res\mipmap-xhdpi"
+New-Item -ItemType Directory -Force -Path "..\target\apk_build\res\mipmap-xxhdpi"
+
+# Copy the shared library
+Copy-Item "..\target\aarch64-linux-android\release\libdsa_rs.so" "..\target\apk_build\lib\arm64-v8a\"
+
+# Copy the manifest
+Copy-Item "..\resources\emulator\AndroidManifest.xml" "..\target\apk_build\AndroidManifest.xml"
+
+# Copy the icons
+Copy-Item "..\resources\emulator\AppIcon.png" "..\target\apk_build\res\mipmap-hdpi\ic_launcher.png"
+Copy-Item "..\resources\emulator\AppIcon.png" "..\target\apk_build\res\mipmap-mdpi\ic_launcher.png"
+Copy-Item "..\resources\emulator\AppIcon.png" "..\target\apk_build\res\mipmap-xhdpi\ic_launcher.png"
+Copy-Item "..\resources\emulator\AppIcon.png" "..\target\apk_build\res\mipmap-xxhdpi\ic_launcher.png"
+
+# Create strings.xml
+@"
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">DSA Emulator</string>
+</resources>
+"@ | Out-File -FilePath "..\target\apk_build\res\values\strings.xml" -Encoding utf8
+
+# Change to build directory
+Push-Location "..\target\apk_build"
+
+try {
+    # Compile resources
+    & "$TOOL_PREFIX\aapt2.exe" compile --dir res -o compiled_resources.zip
+
+    # Link resources
+    & "$TOOL_PREFIX\aapt2.exe" link -o unaligned.apk `
+        -I "$env:ANDROID_HOME\platforms\android-35\android.jar" `
+        --manifest AndroidManifest.xml `
+        compiled_resources.zip
+
+    # Add native libraries to APK
+    & "C:\Program Files\7-Zip\7z.exe" a -tzip unaligned.apk lib\*
+
+    # Align APK
+    & "$TOOL_PREFIX\zipalign.exe" -v 4 unaligned.apk aligned.apk
+
+    # Generate debug keystore if it doesn't exist
+    if (-not (Test-Path "debug.keystore")) {
+        & keytool -genkey -v -keystore debug.keystore -alias androiddebugkey -keyalg RSA -keysize 2048 -validity 10000 -storepass android -keypass android -dname "CN=Android Debug,O=Android,C=US"
+    }
+
+    # Sign APK
+    & "$TOOL_PREFIX\apksigner.bat" sign --ks debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android --key-pass pass:android --out dsa_emulator.apk aligned.apk
+
+    # Copy final APK
+    Copy-Item "dsa_emulator.apk" "..\dsa_emulator.apk"
+
+    Write-Host "APK created successfully at: ..\target\dsa_emulator.apk" -ForegroundColor Green
+}
+catch {
+    Write-Error "Build failed: $_"
+}
+finally {
+    # Return to original directory
+    Pop-Location
+}
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+export ANDROID_HOME="/mnt/c/Users/jacob/AppData/Local/Android/Sdk"
+export TOOL_PREFIX="$ANDROID_HOME/build-tools/35.0.1"
+
+# Only really works on Linux, for aarch64.
+
+mkdir -p ../target/apk_build/lib/arm64-v8a
+mkdir -p ../target/apk_build/res/values
+mkdir -p ../target/apk_build/res/mipmap-hdpi
+mkdir -p ../target/apk_build/res/mipmap-mdpi
+mkdir -p ../target/apk_build/res/mipmap-xhdpi
+mkdir -p ../target/apk_build/res/mipmap-xxhdpi
+
+# Copy the shared library.
+cp ../target/aarch64-linux-android/release/libdsa_rs.so ../target/apk_build/lib/arm64-v8a/
+
+# Copy the manifest.
+cp AndroidManifest.xml ../target/apk_build/AndroidManifest.xml
+
+cat << EOF > ../target/apk_build/res/values/strings.xml
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">DSA Emulator</string>
+</resources>
+EOF
+
+pushd ../target/apk_build
+
+$TOOL_PREFIX/aapt2 compile --dir res -o compiled_resources.zip
+$TOOL_PREFIX/aapt2 link -o unaligned.apk \
+    -I "$ANDROID_HOME/platforms/android-35/android.jar" \
+    --manifest AndroidManifest.xml \
+    compiled_resources.zip
+
+zip -r unaligned.apk lib/
+
+$TOOL_PREFIX/zipalign -v 4 unaligned.apk aligned.apk
+
+keytool -genkey -v -keystore debug.keystore -alias androiddebugkey -keyalg RSA -keysize 2048 -validity 10000 -storepass android -keypass android -dname "CN=Android Debug,O=Android,C=US"
+
+$TOOL_PREFIX/apksigner sign --ks debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android --key-pass pass:android --out dsa_emulator.apk aligned.apk
+
+cp dsa_emulator.apk ../dsa_emulator.apk
+
+popd