Added Android build very wip

.github/workflows/android-compile.yml

@@ -0,0 +1,140 @@
+name: Android Build
+
+on:
+  workflow_dispatch:
+    inputs:
+      build_type:
+        description: 'Build type'
+        required: true
+        default: 'debug'
+        type: choice
+        options:
+        - debug
+        - release
+  push:
+    branches: [ main ]
+    paths: 
+      - 'android/**'
+      - 'src/**'
+      - 'CMakeLists.txt'
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'android/**'
+      - 'src/**'
+      - 'CMakeLists.txt'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  generate-port-o2r:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: sudo apt-get install gcc g++ git cmake ninja-build lsb-release
+    - name: ccache
+      uses: hendrikmuhs/[email protected]
+      with:
+        key: ${{ runner.os }}-o2r-ccache-${{ github.ref }}-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-o2r-ccache-${{ github.ref }}
+          ${{ runner.os }}-o2r-ccache-
+    - name: Cache build folders
+      uses: actions/cache@v4
+      with:
+        key: ${{ runner.os }}-o2r-build-${{ github.ref }}-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-o2r-build-${{ github.ref }}
+          ${{ runner.os }}-o2r-build-
+        path: |
+          torch/cmake-build-release
+    - name: Generate spaghetti.o2r
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        make -C torch type=release -j3
+        torch/cmake-build-release/torch pack assets spaghetti.o2r o2r
+    - uses: actions/upload-artifact@v4
+      with:
+        name: spaghetti.o2r
+        path: spaghetti.o2r
+        retention-days: 1
+
+  build-android:
+    needs: generate-port-o2r
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: sudo apt-get install -y ninja-build
+    - name: Download spaghetti.o2r
+      uses: actions/download-artifact@v4
+      with:
+        name: spaghetti.o2r
+        path: android/app/src/main/assets 
+    - name: Configure Gradle permissions
+      run: chmod +x android/gradlew
+
+    # Set up signing for release builds
+    - name: Setup signing keystore (Release only)
+      if: github.event.inputs.build_type == 'release' || github.ref == 'refs/heads/main'
+      run: |
+        echo "$KEYSTORE_BASE64" | base64 -d > android/app/release.keystore
+        if [ ! -f android/app/release.keystore ]; then
+          echo "Failed to create keystore file"
+          exit 1
+        fi
+        echo "Keystore file created successfully:"
+        ls -la android/app/release.keystore
+        file android/app/release.keystore
+      env:
+        KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+
+    # Build Debug APK
+    - name: Build Debug APK
+      if: github.event.inputs.build_type == 'debug' || github.event.inputs.build_type == ''
+      run: |
+        cd android/
+        ./gradlew assembleDebug -P elfBuildType=RelWithDebInfo
+        mv app/build/outputs/apk/debug/app-debug.apk ../spaghettikart-debug.apk
+
+    # Build Release APK (signed)
+    - name: Build Release APK
+      if: github.event.inputs.build_type == 'release' || github.ref == 'refs/heads/main'
+      run: |
+        cd android/
+        ./gradlew assembleRelease -P elfBuildType=Release
+        mv app/build/outputs/apk/release/app-release.apk ../spaghettikart-release.apk
+      env:
+        KEYSTORE_FILE: release.keystore
+        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+
+    # Upload Debug APK
+    - name: Upload Debug APK
+      if: github.event.inputs.build_type == 'debug' || github.event.inputs.build_type == ''
+      uses: actions/upload-artifact@v4
+      with:
+        name: spaghetti-kart-debug-apk
+        path: spaghettikart-debug.apk
+
+    # Upload Release APK
+    - name: Upload Release APK
+      if: github.event.inputs.build_type == 'release' || github.ref == 'refs/heads/main'
+      uses: actions/upload-artifact@v4
+      with:
+        name: spaghetti-kart-release-apk
+        path: spaghettikart-release.apk
+
+    # Clean up keystore
+    - name: Clean up keystore
+      if: always()
+      run: rm -f android/app/release.keystore
+

.github/workflows/main.yml

@@ -356,6 +356,7 @@ jobs:
           submodules: recursive
       - name: Install dependencies
         run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
           sudo apt-get update
           sudo apt-get install -y ninja-build
           sudo apt-get remove -y cmake

.github/workflows/release.yml

@@ -0,0 +1,174 @@
+name: Create Android Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release version (e.g., 1.0.1)'
+        required: true
+        default: '1.0.0'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  generate-port-o2r:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Install dependencies
+      run: sudo apt-get update && sudo apt-get install -y gcc g++ git cmake ninja-build lsb-release
+
+    - name: ccache
+      uses: hendrikmuhs/[email protected]
+      with:
+        key: ${{ runner.os }}-o2r-ccache-${{ github.ref }}-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-o2r-ccache-${{ github.ref }}
+          ${{ runner.os }}-o2r-ccache-
+
+    - name: Cache build folders
+      uses: actions/cache@v4
+      with:
+        key: ${{ runner.os }}-o2r-build-${{ github.ref }}-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-o2r-build-${{ github.ref }}
+          ${{ runner.os }}-o2r-build-
+        path: |
+          torch/cmake-build-release
+
+    - name: Generate spaghetti.o2r
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        make -C torch type=release -j3
+        torch/cmake-build-release/torch pack assets spaghetti.o2r o2r
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: spaghetti.o2r
+        path: spaghetti.o2r
+        retention-days: 1
+
+  build-android:
+    needs: generate-port-o2r
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+
+    - name: Install build tools
+      run: sudo apt-get update && sudo apt-get install -y ninja-build
+
+    - name: Download spaghetti.o2r
+      uses: actions/download-artifact@v4
+      with:
+        name: spaghetti.o2r
+        path: android/app/src/main/assets 
+
+    - name: Configure Gradle permissions
+      run: chmod +x android/gradlew
+
+    - name: Update version in build.gradle
+      run: |
+        sed -i "s/versionName \".*\"/versionName \"${{ github.event.inputs.version }}\"/" android/app/build.gradle
+        CURRENT_CODE=$(grep "versionCode" android/app/build.gradle | sed 's/.*versionCode \([0-9]*\).*/\1/')
+        NEW_CODE=$((CURRENT_CODE + 1))
+        sed -i "s/versionCode $CURRENT_CODE/versionCode $NEW_CODE/" android/app/build.gradle
+        echo "Updated to version ${{ github.event.inputs.version }} with code $NEW_CODE"
+
+    - name: Setup signing keystore
+      run: |
+        echo "$KEYSTORE_BASE64" | base64 -d > android/app/release.keystore
+        test -f android/app/release.keystore || (echo "Failed to create keystore file" && exit 1)
+        echo "Keystore file created successfully:"
+        ls -la android/app/release.keystore
+        file android/app/release.keystore
+      env:
+        KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+
+    - name: Build Release APK
+      run: |
+        cd android/
+        ./gradlew --no-daemon assembleRelease -P elfBuildType=Release
+        mv app/build/outputs/apk/release/app-release.apk ../spaghettikart-release.apk
+      env:
+        KEYSTORE_FILE: release.keystore
+        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+
+    - name: Upload Release APK (artifact for next job)
+      uses: actions/upload-artifact@v4
+      with:
+        name: spaghettikart-release-apk
+        path: spaghettikart-release.apk
+        retention-days: 1
+
+  create-release:
+    needs: build-android
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Download Release APK
+      uses: actions/download-artifact@v4
+      with:
+        name: spaghettikart-release-apk
+        path: .
+
+    - name: Create Release
+      id: create_release
+      uses: softprops/action-gh-release@v2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: v${{ github.event.inputs.version }}
+        name: 🏎️ Spaghetti Kart v${{ github.event.inputs.version }}
+        body: |
+          ## 🏎️ Spaghetti Kart v${{ github.event.inputs.version }}
+
+          ### 📱 Android Release
+
+          **✨ Highlights:**
+          - ⚡ Optimized release build with R8 code shrinking
+          - 📦 Reduced APK size and improved performance
+          - 🗂️ Enhanced file management with SAF integration
+
+          ### 🛠️ Changes
+          - 🧭 Improved folder selection with SAF (Storage Access Framework)
+          - 🔁 Automatic mods syncing from user folder
+          - 🧊 Better UI with rounded dialogs
+          - 🔥 Torch app integration for easy mk64.o2r creation
+
+          ### 📥 Installation
+          1. ⬇️ Download the APK below
+          2. 📲 Install on your Android device
+          3. 🔓 Enable "Install from unknown sources" in Android settings
+          4. 📁 Select a folder for your game files
+          5. 💾 Add your mk64.o2r file (use Torch app to create from ROM)
+          6. 🎮 Enjoy!
+
+    - name: Upload Release APK
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./spaghettikart-release.apk
+        asset_name: SpaghettiKart-v${{ github.event.inputs.version }}-release.apk
+        asset_content_type: application/vnd.android.package-archive       
+

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "torch"]
 	path = torch
 	url = https://github.com/HarbourMasters/Torch
-[submodule "libultraship"]
-	path = libultraship
-	url = https://github.com/Kenix3/libultraship
 [submodule "lib/wasm-micro-runtime"]
 	path = lib/wasm-micro-runtime
 	url = https://github.com/bytecodealliance/wasm-micro-runtime.git