Claude/gamenative comprehensive review egflnd

.github/workflows/app-release-signed.yml

@@ -13,6 +13,8 @@ on:
 
 jobs:
   build:
+    # Needs the upstream repo's signing/API secrets; forks build via build-apk.yml.
+    if: github.repository == 'utkarshdalal/GameNative'
 
     runs-on: ubuntu-latest
 

.github/workflows/build-apk.yml

@@ -0,0 +1,150 @@
+name: Build Debug APK
+
+on:
+  push:
+    branches: [ main, master, 'claude/**' ]
+    paths-ignore:
+      - '**.md'
+      - '.gitignore'
+      - 'keyvalues/**'
+      - 'media/**'
+      - '.github/ISSUE_TEMPLATE/**'
+  workflow_dispatch:
+
+# Serialize builds on the same branch so overlapping runs don't fight over the rolling Release
+# tag. cancel-in-progress:false means rapid pushes QUEUE (each commit still gets a build + release)
+# instead of cancelling each other — important during active development.
+concurrency:
+  group: build-apk-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  # Runs immediately (in parallel with build): frees Actions storage BEFORE the build job
+  # uploads its ~800 MB of artifacts — otherwise a 100%-full quota fails the upload itself.
+  # Keeps only the artifacts of the 4 most recent runs of this workflow.
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_REPO: ${{ github.repository }}
+    steps:
+      - name: Delete artifacts older than the last 4 runs
+        run: |
+          set -uo pipefail
+          KEEP_RUNS=$(gh api "repos/$GH_REPO/actions/workflows/build-apk.yml/runs?per_page=4" \
+            -q '.workflow_runs[].id' | tr '\n' ' ')
+          echo "Keeping artifacts of runs: $KEEP_RUNS"
+          gh api --paginate "repos/$GH_REPO/actions/artifacts?per_page=100" \
+            -q '.artifacts[] | "\(.id) \(.workflow_run.id) \(.size_in_bytes)"' |
+          while read -r ART_ID RUN_ID SIZE; do
+            KEEP=false
+            for K in $KEEP_RUNS; do
+              if [ "$RUN_ID" = "$K" ]; then KEEP=true; break; fi
+            done
+            if [ "$KEEP" = "false" ]; then
+              echo "Deleting artifact $ART_ID (run $RUN_ID, $SIZE bytes)"
+              gh api -X DELETE "repos/$GH_REPO/actions/artifacts/$ART_ID" || true
+            fi
+          done
+          echo "Cleanup done."
+
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checking out GameNative
+        uses: actions/checkout@v4
+
+      - name: Setup Java 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Inject dummy credentials
+        run: |
+          cat <<EOF > local.properties
+          POSTHOG_API_KEY=dummy
+          POSTHOG_HOST=https://us.i.posthog.com
+          EOF
+
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build debug APKs (legacy + modern)
+        run: ./gradlew :app:assembleLegacyDebug :app:assembleModernDebug
+
+      # retention-days: 1 — artifacts only exist to hand the APKs to the release job;
+      # the durable download is the Release (which does NOT count against Actions storage).
+      - name: Upload legacy debug APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: gamenative-legacy-debug-apk
+          path: app/build/outputs/apk/legacy/debug/*.apk
+          retention-days: 1
+
+      - name: Upload modern debug APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: gamenative-modern-debug-apk
+          path: app/build/outputs/apk/modern/debug/*.apk
+          retention-days: 1
+
+  # Publishing the ~800 MB of APKs to a Release is slow, so it runs in its own job AFTER build.
+  # This keeps the build job (and therefore the downloadable Actions artifacts) available quickly,
+  # while still offering the easier-to-download Release. Scoped to claude/** branches and manual
+  # runs so it never touches main's releases.
+  release:
+    needs: build
+    if: startsWith(github.ref_name, 'claude/') || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write   # create/update the Release
+      actions: read      # download-artifact reads this run's artifacts
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_REPO: ${{ github.repository }}
+
+    steps:
+      - name: Download built APKs
+        uses: actions/download-artifact@v4
+        with:
+          path: apks
+
+      - name: Publish debug APKs as a rolling prerelease
+        run: |
+          set -euo pipefail
+          TAG="debug-$(printf '%s' "$GITHUB_REF_NAME" | tr '/' '-')"
+          NOTES="Automated debug APKs for branch \`$GITHUB_REF_NAME\` at commit \`${GITHUB_SHA:0:8}\`.
+
+          - **gamenative-modern-debug** — most modern phones.
+          - **gamenative-legacy-debug** — legacy / glibc path (larger).
+
+          Debug-signed; install may require enabling \"install from unknown sources\"."
+
+          # IMPORTANT: never delete the release/tag. Deleting them leaves a multi-minute window
+          # (while the ~800 MB of APKs re-upload) where the download URLs 404 — that was the
+          # "the link keeps disappearing" problem. Instead keep the rolling release alive and
+          # overwrite the assets in place, so the download URLs stay valid across every build.
+          if gh release view "$TAG" >/dev/null 2>&1; then
+            gh release edit "$TAG" \
+              --prerelease \
+              --title "Debug build — $GITHUB_REF_NAME" \
+              --notes "$NOTES"
+          else
+            gh release create "$TAG" \
+              --target "$GITHUB_SHA" \
+              --prerelease \
+              --title "Debug build — $GITHUB_REF_NAME" \
+              --notes "$NOTES"
+          fi
+
+          # --clobber replaces each asset in place (stable names → stable, always-live URLs).
+          # Upload the smaller modern APK first so the most-used download refreshes soonest.
+          gh release upload "$TAG" apks/gamenative-modern-debug-apk/*.apk --clobber
+          gh release upload "$TAG" apks/gamenative-legacy-debug-apk/*.apk --clobber

.github/workflows/pluvia-pr-check.yml

@@ -26,8 +26,8 @@ jobs:
         if: github.event.pull_request.head.repo.full_name == github.repository
         run: |
           cat <<EOF > local.properties
-          POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}
-          POSTHOG_HOST=${{ secrets.POSTHOG_HOST }}
+          POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY || 'dummy' }}
+          POSTHOG_HOST=${{ secrets.POSTHOG_HOST || 'https://us.i.posthog.com' }}
           EOF
       - name: Inject dummy credentials
         if: github.event.pull_request.head.repo.full_name != github.repository

app/build.gradle.kts

@@ -225,6 +225,9 @@ android {
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
+            // Return defaults for unmocked android.jar calls (e.g. android.util.Log) instead
+            // of throwing, so plain-JVM unit tests that touch logging don't fail spuriously.
+            isReturnDefaultValues = true
         }
     }
 

app/src/main/AndroidManifest.xml

@@ -8,10 +8,12 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="29"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.INTERNET" />

app/src/main/assets/box64_env_vars.json

@@ -8,7 +8,14 @@
     {"name" : "BOX64_DYNAREC_FORWARD", "values" : ["0", "128", "256", "512", "1024"], "defaultValue" : "128"},
     {"name" : "BOX64_DYNAREC_CALLRET", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
     {"name" : "BOX64_DYNAREC_WAIT", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
+    {"name" : "BOX64_DYNAREC_WEAKBARRIER", "values" : ["0", "1", "2"], "defaultValue" : "0"},
+    {"name" : "BOX64_DYNAREC_PAUSE", "values" : ["0", "1", "2", "3"], "defaultValue" : "0"},
+    {"name" : "BOX64_DYNAREC_ALIGNED_ATOMICS", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "0"},
+    {"name" : "BOX64_DYNAREC_BLEEDING_EDGE", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "0"},
     {"name" : "BOX64_AVX", "values" : ["0", "1", "2"], "defaultValue" : "1"},
-    {"name" : "BOX64_MAXCPU", "values" : ["4", "8", "16", "32", "64"], "defaultValue" : "8"},
+    {"name" : "BOX64_SSE42", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
+    {"name" : "BOX64_SHAEXT", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
+    {"name" : "BOX64_MMAP32", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
+    {"name" : "BOX64_MAXCPU", "values" : ["0", "4", "8", "16", "32", "64"], "defaultValue" : "8"},
     {"name" : "BOX64_UNITYPLAYER", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"}
 ]

app/src/main/cpp/asurfacerenderer/drawable.c

@@ -124,18 +124,34 @@ Java_com_winlator_xserver_Drawable_copyArea(JNIEnv *env, jclass obj, jshort srcX
             }
         }
     } else {
-        /* Fast path when not using ASR - direct copy without conversion */
+        /* Fast path when not using ASR - direct copy without conversion.
+           Use memmove, not memcpy: an X11 CopyArea within a single drawable (e.g. scrolling a
+           window onto itself) makes srcData and dstData the same buffer with overlapping source
+           and destination regions, and memcpy on overlapping ranges is undefined behaviour. */
+        int sameBuffer = (srcDataAddr == dstDataAddr);
         if (width == srcStride && width == dstStride) {
+            /* One contiguous block: memmove handles any overlap correctly. */
             size_t bytes = (size_t)height * dstStride * 4;
-            memcpy(dstDataAddr + (dstX + dstY * dstStride) * 4,
-                   srcDataAddr + (srcX + srcY * srcStride) * 4,
-                   bytes);
+            memmove(dstDataAddr + (dstX + dstY * dstStride) * 4,
+                    srcDataAddr + (srcX + srcY * srcStride) * 4,
+                    bytes);
         } else {
             size_t rowBytes = (size_t)width * 4;
-            for (int16_t y = 0; y < height; y++) {
-                memcpy(dstDataAddr + (dstX + (y + dstY) * dstStride) * 4,
-                       srcDataAddr + (srcX + (y + srcY) * srcStride) * 4,
-                       rowBytes);
+            /* memmove protects overlap within a row; across rows we must also pick a safe
+               direction. When copying downward in the same buffer (dstY > srcY), iterate
+               bottom-to-top so a source row isn't overwritten before it is read. */
+            if (sameBuffer && dstY > srcY) {
+                for (int16_t y = height - 1; y >= 0; y--) {
+                    memmove(dstDataAddr + (dstX + (y + dstY) * dstStride) * 4,
+                            srcDataAddr + (srcX + (y + srcY) * srcStride) * 4,
+                            rowBytes);
+                }
+            } else {
+                for (int16_t y = 0; y < height; y++) {
+                    memmove(dstDataAddr + (dstX + (y + dstY) * dstStride) * 4,
+                            srcDataAddr + (srcX + (y + srcY) * srcStride) * 4,
+                            rowBytes);
+                }
             }
         }
     }

app/src/main/cpp/patchelf/CMakeLists.txt

@@ -10,3 +10,6 @@ add_library(patchelf SHARED
             src/patchelf.cc)
 
 target_link_libraries(patchelf)
+
+# Align ELF LOAD segments to 16 KB for Android 15+ devices with 16 KB page size.
+target_link_options(patchelf PRIVATE -Wl,-z,max-page-size=16384)

app/src/main/cpp/proot/CMakeLists.txt

@@ -45,4 +45,7 @@ target_link_libraries(libproot.so
                       talloc)
 
 add_library(proot-loader SHARED
-            src/loader/loader.c)
+            src/loader/loader.c)
+# Align ELF LOAD segments to 16 KB for Android 15+ devices with 16 KB page size.
+target_link_options(libproot.so PRIVATE -Wl,-z,max-page-size=16384)
+target_link_options(proot-loader PRIVATE -Wl,-z,max-page-size=16384)

app/src/main/cpp/virglrenderer/CMakeLists.txt

@@ -52,4 +52,6 @@ target_link_libraries(virglrenderer
                       android
                       EGL
                       GLESv2
-                      GLESv3)
+                      GLESv3)
+# Align ELF LOAD segments to 16 KB for Android 15+ devices with 16 KB page size.
+target_link_options(virglrenderer PRIVATE -Wl,-z,max-page-size=16384)

app/src/main/cpp/winlator/xconnector_epoll.c

@@ -27,8 +27,6 @@ typedef struct {
 
 static FdTracker fd_tracking[MAX_TRACKED_FDS] = {0};
 
-struct epoll_event events[MAX_EVENTS];
-
 static int waitForEpollEvents(jint epollFd, struct epoll_event *epollEvents, int maxEvents) {
     while (true) {
         int numFds = epoll_wait(epollFd, epollEvents, maxEvents, -1);
@@ -160,6 +158,10 @@ Java_com_winlator_xconnector_XConnectorEpoll_doEpollIndefinitely(JNIEnv *env, jo
     jmethodID handleExistingConnection =
             (*env)->GetMethodID(env, cls, "handleExistingConnection", "(I)V");
 
+    // Stack-local, not file-scope: multiple connector threads (X server, VirGL, Vortek, ALSA, SysV
+    // SHM) each run this function concurrently, so a shared global buffer was a data race that could
+    // corrupt event dispatch across connectors.
+    struct epoll_event events[MAX_EVENTS];
     int numFds = waitForEpollEvents(epollFd, events, MAX_EVENTS);
     if (numFds < 0) {
         return JNI_FALSE;

app/src/main/java/app/gamenative/MainActivity.kt

@@ -629,13 +629,45 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+    /**
+     * Maps an allowed-orientation set to the Android sensor constant that lets the OS rotate
+     * the game freely within it — so a phone held in either landscape (or either portrait)
+     * auto-rotates to match. Returns null for mixed/single sets that need the manual pick below.
+     */
+    private fun sensorOrientationFor(conformTo: EnumSet<Orientation>): Int? {
+        val landscapes = EnumSet.of(Orientation.LANDSCAPE, Orientation.REVERSE_LANDSCAPE)
+        val portraits = EnumSet.of(Orientation.PORTRAIT, Orientation.REVERSE_PORTRAIT)
+        return when {
+            conformTo.contains(Orientation.UNSPECIFIED) -> ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR
+            conformTo == landscapes || conformTo.containsAll(landscapes) &&
+                !conformTo.contains(Orientation.PORTRAIT) && !conformTo.contains(Orientation.REVERSE_PORTRAIT) ->
+                ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+            conformTo == portraits || conformTo.containsAll(portraits) &&
+                !conformTo.contains(Orientation.LANDSCAPE) && !conformTo.contains(Orientation.REVERSE_LANDSCAPE) ->
+                ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+            conformTo.size >= 3 -> ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR
+            else -> null
+        }
+    }
+
     private fun setOrientationTo(orientation: Int, conformTo: EnumSet<Orientation>) {
         if (isHeadset(this)) {
             if (requestedOrientation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
                 requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
             }
             return
         }
+
+        // Let Android's own sensor drive rotation whenever the allowed set is a natural
+        // sensor group. The custom OrientationEventListener (startOrientator) is disabled
+        // because it leaked/restarted the Activity, which left currentOrientationChangeValue
+        // stuck at 0 — so the manual angle math below locked the game to ONE fixed landscape.
+        // SENSOR_LANDSCAPE flips freely between the two landscapes as the phone turns (and the
+        // same for portrait / full sensor), which is exactly the "follow the device" behaviour.
+        sensorOrientationFor(conformTo)?.let { sensor ->
+            if (requestedOrientation != sensor) requestedOrientation = sensor
+            return
+        }
         // Log.d("MainActivity$index", "Setting orientation to conform")
 
         // reverse direction of orientation

app/src/main/java/app/gamenative/PluviaApp.kt

@@ -68,6 +68,15 @@ class PluviaApp : SplitCompatApplication() {
             Timber.plant(ReleaseTree())
         }
 
+        // Bounded on-device session log (survives kills; capped at ~4 MB, rotating). In debug we
+        // persist everything; in release only WARN+ to keep the hot path cheap.
+        app.gamenative.utils.SessionLogger.init(this)
+        Timber.plant(
+            app.gamenative.utils.SessionLogger.Tree(
+                persistFromPriority = if (BuildConfig.DEBUG) android.util.Log.DEBUG else android.util.Log.WARN,
+            ),
+        )
+
         NetworkMonitor.init(this)
 
         // Init our custom crash handler.