Ci fix android

.github/actions/build-library-and-upload/action.yml

@@ -16,7 +16,7 @@ runs:
     - id: build
       run: |
         rm -rf out
-        cmake --preset ${{ inputs.preset }} -DBUILD_SHARED_LIBS=ON
+        cmake --preset ${{ inputs.preset }}
         cmake --build ./build/${{ inputs.preset }} --config ${{ inputs.build-type }} --verbose
         cmake --install ./build/${{ inputs.preset }} --config ${{ inputs.build-type }}
       working-directory: ${{ inputs.nakama-cpp-path }}

.github/actions/setup-android/action.yml

@@ -0,0 +1,85 @@
+name: 'Setup Android'
+description: 'Sets up Java and Android SDK components'
+inputs:
+  java-version:
+    description: 'Java version'
+    required: false
+    default: '17'
+  ndk-version:
+    description: 'Android NDK version'
+    required: true
+  cmake-version:
+    description: 'Android CMake version'
+    required: true
+  install-emulator:
+    description: 'Whether to install emulator packages'
+    required: false
+    default: 'false'
+  system-image:
+    description: 'Android system image package'
+    required: false
+    default: ''
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: ${{ inputs.java-version }}
+
+    - name: Install Android SDK packages
+      shell: bash
+      run: |
+        set -euo pipefail
+
+        # Initialize ANDROID_HOME if not set (standard on x86, missing on ARM)
+        if [ -z "${ANDROID_HOME:-}" ]; then
+          export ANDROID_HOME="$HOME/android-sdk"
+          mkdir -p "$ANDROID_HOME"
+        fi
+        echo "ANDROID_HOME=$ANDROID_HOME" >> "$GITHUB_ENV"
+
+        # Install command-line tools if missing
+        if [ ! -d "$ANDROID_HOME/cmdline-tools/latest" ]; then
+          echo "Downloading Android Command Line Tools..."
+          mkdir -p "$ANDROID_HOME/cmdline-tools"
+          curl -LSs https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -o cmdline-tools.zip
+          unzip -q cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools"
+          mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest"
+          rm cmdline-tools.zip
+        fi
+
+        SDKMANAGER="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
+
+        packages=(
+          "ndk;${{ inputs.ndk-version }}"
+          "cmake;${{ inputs.cmake-version }}"
+        )
+
+        #use emulator for test-android
+        if [ "${{ inputs.install-emulator }}" = "true" ]; then
+          packages+=("emulator")
+          packages+=("platform-tools")
+          if [ -n "${{ inputs.system-image }}" ]; then
+            packages+=("${{ inputs.system-image }}")
+          fi
+        fi
+
+        # Accept licenses
+        yes | "$SDKMANAGER" --sdk_root="$ANDROID_HOME" --licenses || true
+
+        "$SDKMANAGER" --sdk_root="$ANDROID_HOME" "${packages[@]}"
+
+    - name: Set Android environment variables
+      shell: bash
+      run: |
+        export NDK_PATH="$ANDROID_HOME/ndk/${{ inputs.ndk-version }}"
+        echo "ANDROID_NDK=$NDK_PATH" >> "$GITHUB_ENV"
+        echo "ANDROID_NDK_HOME=$NDK_PATH" >> "$GITHUB_ENV"
+        echo "ANDROID_NDK_ROOT=$NDK_PATH" >> "$GITHUB_ENV"
+        echo "ANDROID_HOME=$ANDROID_HOME" >> "$GITHUB_ENV"
+        echo "$ANDROID_HOME/cmake/${{ inputs.cmake-version }}/bin" >> "$GITHUB_PATH"
+        echo "$ANDROID_HOME/platform-tools" >> "$GITHUB_PATH"
+        echo "$ANDROID_HOME/cmdline-tools/latest/bin" >> "$GITHUB_PATH"

.github/actions/setup-vcpkg-android/action.yml

@@ -0,0 +1,19 @@
+name: 'Setup vcpkg for Android'
+description: 'Setup vcpkg for Android workflow'
+inputs:
+  vcpkg-path:
+    description: 'Path to vcpkg'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set VCPKG_ROOT
+      shell: bash
+      run: echo "VCPKG_ROOT=${{ github.workspace }}/${{ inputs.vcpkg-path }}" >> $GITHUB_ENV
+
+    - name: Bootstrap vcpkg
+      shell: bash
+      run: ./bootstrap-vcpkg.sh -disableMetrics
+      working-directory: ${{ inputs.vcpkg-path }}
+

.github/workflows/build_android.yml

@@ -1,29 +1,57 @@
 name: Build Android
 on: [workflow_call, workflow_dispatch]
+
 jobs:
   build_android:
-    timeout-minutes: 30
-    strategy:
-      matrix:
-        preset: ["android-arm64-v8a-host_linux-x64", "android-x64-host_linux-x64", "android-armeabi-v7a-host_linux-x64"]
-        build-type: [MinSizeRel]
+    timeout-minutes: 60
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout nakama-cpp
+        uses: actions/checkout@v4
         with:
           path: nakama-cpp
-      - uses: ./nakama-cpp/.github/actions/setup-vcpkg
+          submodules: false
+
+      - name: Checkout vcpkg submodule
+        run: |
+          git submodule update --init --filter=blob:none -- submodules/vcpkg
+        working-directory: nakama-cpp
+
+      - uses: ./nakama-cpp/.github/actions/setup-android
         with:
-          github_token: ${{ secrets.github_token }}
-          vcpkg-path: vcpkg
-      - uses: ./nakama-cpp/.github/actions/setup-ubuntu
-      - uses: ./nakama-cpp/.github/actions/build-library-and-upload
+          ndk-version: 27.2.12479018
+          cmake-version: 4.0.2
+
+      - uses: ./nakama-cpp/.github/actions/setup-vcpkg-android
         with:
-          nakama-cpp-path: nakama-cpp
-          preset: ${{ matrix.preset }}
-          build-type: ${{ matrix.build-type }}
-      - if: failure()
-        uses: ./nakama-cpp/.github/actions/handle-failure
+          vcpkg-path: nakama-cpp/submodules/vcpkg
+
+      - name : Build with Gradle
+        run : ./gradlew build --no-daemon
+        working-directory: nakama-cpp/android
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
         with:
-          nakama-cpp-path: nakama-cpp
-          vcpkg-path: vcpkg
+          name: nakama-sdk-android-aar
+          path: nakama-cpp/android/nakama-sdk/build/outputs/aar/*.aar
+          if-no-files-found: error
+
+      # - name: Install NDK & CMake
+      #   run: |
+      #     # On GitHub ubuntu runners ANDROID_HOME is set as a shell env var.
+      #     # sdkmanager is NOT on PATH, use the full path.
+      #     "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
+      #       --sdk_root="$ANDROID_HOME" \
+      #       "ndk;27.2.12479018" \
+      #       "cmake;4.0.2"
+
+      # - name: Add CMake to PATH
+      #   run: echo "$ANDROID_HOME/cmake/4.0.2/bin" >> "$GITHUB_PATH"
+
+      # - name: Set VCPKG_ROOT
+      #   run: echo "VCPKG_ROOT=$GITHUB_WORKSPACE/nakama-cpp/submodules/vcpkg" >> $GITHUB_ENV
+
+      # - name: Bootstrap vcpkg
+      #   run: ./bootstrap-vcpkg.sh -disableMetrics
+      #   working-directory: nakama-cpp/submodules/vcpkg

.github/workflows/test_android.yml

@@ -0,0 +1,59 @@
+name: Test Android
+on: [workflow_call, workflow_dispatch, pull_request]
+
+jobs:
+  test_android:
+    timeout-minutes: 90
+    runs-on: ubuntu-22.04
+    env:
+      ABI: x86_64
+      CMAKE_PRESET: android-x86_64
+
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Checkout nakama-cpp
+        uses: actions/checkout@v4
+        with:
+          path: nakama-cpp
+          submodules: false
+
+      - name: Checkout vcpkg submodule
+        run: |
+          git submodule update --init --filter=blob:none -- submodules/vcpkg
+        working-directory: nakama-cpp
+
+      - uses: ./nakama-cpp/.github/actions/setup-android
+        with:
+          ndk-version: 27.2.12479018
+          cmake-version: 4.0.2
+          install-emulator: true
+          system-image: "system-images;android-29;google_apis;x86_64"
+
+      - uses: ./nakama-cpp/.github/actions/setup-vcpkg-android
+        with:
+          vcpkg-path: nakama-cpp/submodules/vcpkg
+
+      - name: Start Nakama server
+        run: docker compose -f integrationtests/server/docker-compose.yml up -d --build --wait
+        working-directory: nakama-cpp
+
+      - name: Install Task
+        run: npm install -g @go-task/cli
+
+      - name: Run tests on emulator
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          target: google_apis
+          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -memory 4096 -cores 2
+          disable-animations: true
+          timeout: 50
+          script: |
+            set -xe && for port in 7349 7350 7351; do adb reverse tcp:$port tcp:$port; done && cd nakama-cpp && sleep 30 && task test-android ABI=$ABI CMAKE_EXTRA="-DCMAKE_ANDROID_ARCH_ABI=$ABI -DANDROID_ABI=$ABI"

CMakePresets.json

@@ -114,6 +114,14 @@
         "ANDROID_ABI": "armeabi-v7a"
       }
     },
+    {
+      "name": "android-x86_64",
+      "inherits": ["android-default"],
+      "cacheVariables": {
+        "VCPKG_TARGET_TRIPLET": "x86-64-android-heroic",
+        "ANDROID_ABI": "x86_64"
+      }
+    },
     {
       "name": "linux-amd64",
       "inherits": ["default"],

Taskfile.yml

@@ -167,7 +167,7 @@ tasks:
           -DCMAKE_MAKE_PROGRAM="$(command -v ninja)"
 
         cmake --build "build/{{.CMAKE_PRESET}}" --config Debug \
-          --target nakama-sdk nakama-test
+          --target nakama-sdk nakama-test -- -j 1
 
         # --- Stage native libraries for Gradle ---
         echo "=== Staging native libraries ==="
@@ -180,6 +180,7 @@ tasks:
         case "{{.ABI}}" in
           arm64-v8a)   triple="aarch64-linux-android";;
           armeabi-v7a) triple="arm-linux-androideabi";;
+          x86_64)      triple="x86_64-linux-android";;
         esac
         stl_lib="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/${HOST_OS}-x86_64/sysroot/usr/lib/${triple}/libc++_shared.so"
         if [ -f "$stl_lib" ]; then

integrationtests/android/build.gradle

@@ -20,11 +20,11 @@ buildscript {
     }
 }
 plugins {
-    id('com.android.application') version '7.1.1'
+    id('com.android.application') version '7.3.0'
 }
 
 def abi = (project.findProperty("abi") ?: "arm64-v8a").toString()
-def supportedAbis = ["arm64-v8a", "armeabi-v7a"]
+def supportedAbis = ["arm64-v8a", "armeabi-v7a", "x86_64"]
 if (!supportedAbis.contains(abi)) {
     throw new GradleException("Unsupported abi '${abi}'. Supported values: ${supportedAbis}")
 }
@@ -40,11 +40,13 @@ repositories {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdk 34
+    ndkVersion "27.2.12479018"
+
     defaultConfig {
         applicationId "com.heroiclabs.nakamatest"
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdk 21
+        targetSdk 34
         versionCode 1
         versionName '1.0'
         ndk {

integrationtests/src/NTestLib.cpp

@@ -91,11 +91,18 @@ int runAllTests(
   // Run internals first (pure unit tests, no server)
   test_internals();
 
+#ifdef ANDROID
+  // Launch all test groups sequentially to avoid resource contention on emulator
+  auto startSuite = [](const char* suiteName, void (*suite)()) {
+    runSuiteSafely(suiteName, suite);
+  };
+#else
   // Launch all test groups in parallel threads
   std::vector<std::thread> threads;
   auto startSuite = [&threads](const char* suiteName, void (*suite)()) {
     threads.emplace_back([suiteName, suite]() { runSuiteSafely(suiteName, suite); });
   };
+#endif
 
   startSuite("test_authentication", test_authentication);
   startSuite("test_session", test_session);
@@ -122,9 +129,12 @@ int runAllTests(
   startSuite("test_throughput", test_throughput);
   startSuite("test_cancellation", test_cancellation);
 
+#ifndef ANDROID
   for (auto& t : threads) {
     t.join();
   }
+#endif
+
 
   // total stats
   uint32_t total = g_runTestsCount.load();