Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
ci: transition Android E2E job to Linux runner using KVM hardware acceleration and x86_64 image
Antonio Ojea05d4664d122f
diff --git a/.github/workflows/test_flutter.yaml b/.github/workflows/test_flutter.yamlindex 1432a42f..32d485b6 100644--- a/.github/workflows/test_flutter.yaml+++ b/.github/workflows/test_flutter.yaml@@ -51,7 +51,7 @@ jobs:working-directory: mobile/sam-node-appe2e-android:- runs-on: macos-latest+ runs-on: ubuntu-lateststeps:- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v6- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6@@ -65,13 +65,18 @@ jobs:with:java-version: '17'distribution: 'temurin'+ - name: Enable KVM group perms+ run: |+ echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules+ sudo udevadm control --reload-rules+ sudo udevadm trigger --name-match=kvm- name: Run E2E Integration Test in Android Emulatoruses: ReactiveCircus/android-emulator-runner@b86636dcd5723ef0161e7f288e9bd0ad01258791 # v2.30.0with:api-level: 30target: google_apis- arch: arm64-v8a+ arch: x86_64disable-animations: true- emulator-options: -no-window -no-snapshot -noaudio -no-boot-anim -camera-back none- emulator-boot-timeout: 400+ emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none+ emulator-boot-timeout: 300script: ./mobile/mobile_e2e.shdiff --git a/Makefile b/Makefileindex d5ba173a..e703c201 100644--- a/Makefile+++ b/Makefile@@ -25,7 +25,7 @@ build:go build -v -o "$(OUT_DIR)/sam-hub" ./cmd/sam-hubgo build -v -o "$(OUT_DIR)/mcp-client" ./cmd/mcp-client-.PHONY: mobile-ffi-host mobile-ffi-android mobile-ffi-ios mobile-ffi mobile-app-apk mobile-app-apk-emulator+.PHONY: mobile-ffi-host mobile-ffi-android mobile-ffi-android-x86_64 mobile-ffi-ios mobile-ffi mobile-app-apk mobile-app-apk-emulatormobile-ffi-host:mkdir -p "$(OUT_DIR)"CGO_ENABLED=1 go build -v -buildmode=c-shared -o "$(OUT_DIR)/libsam.so" ./mobile/sam-node-ffi@@ -38,24 +38,26 @@ mobile-ffi-android:mkdir -p "$(OUT_DIR)/android"GOOS=android GOARCH=arm64 CGO_ENABLED=1 CC=$(ANDROID_CC_ARM64) go build -v -buildmode=c-shared -o "$(OUT_DIR)/android/libsam.so" ./mobile/sam-node-ffi+mobile-ffi-android-x86_64:+ @if [ -z "$(ANDROID_NDK_LATEST)" ]; then \+ echo "Error: Android NDK not found under $(ANDROID_HOME_RESOLVED)/ndk/. Please install NDK (Side-by-side) via Android Studio or sdkmanager." >&2; \+ exit 1; \+ fi+ mkdir -p "$(OUT_DIR)/android-x86_64"+ GOOS=android GOARCH=amd64 CGO_ENABLED=1 CC=$(ANDROID_CC_X86_64) go build -v -buildmode=c-shared -o "$(OUT_DIR)/android-x86_64/libsam.so" ./mobile/sam-node-ffi+mobile-ffi-ios:mkdir -p "$(OUT_DIR)/ios"GOOS=ios GOARCH=arm64 CGO_ENABLED=1 go build -v -buildmode=c-archive -o "$(OUT_DIR)/ios/libsam.a" ./mobile/sam-node-ffi-mobile-ffi: mobile-ffi-host mobile-ffi-android mobile-ffi-ios+mobile-ffi: mobile-ffi-host mobile-ffi-android mobile-ffi-android-x86_64 mobile-ffi-iosmobile-app-apk: mobile-ffi-androidmkdir -p mobile/sam-node-app/android/app/src/main/jniLibs/arm64-v8acp "$(OUT_DIR)/android/libsam.so" mobile/sam-node-app/android/app/src/main/jniLibs/arm64-v8a/libsam.socd mobile/sam-node-app && flutter build apk --release-mobile-app-apk-emulator:- @if [ -z "$(ANDROID_NDK_LATEST)" ]; then \- echo "Error: Android NDK not found under $(ANDROID_HOME_RESOLVED)/ndk/. Please install NDK (Side-by-side) via Android Studio or sdkmanager." >&2; \- exit 1; \- fi- mkdir -p "$(OUT_DIR)/android-x86_64"- GOOS=android GOARCH=amd64 CGO_ENABLED=1 CC=$(ANDROID_CC_X86_64) go build -v -buildmode=c-shared -o "$(OUT_DIR)/android-x86_64/libsam.so" ./mobile/sam-node-ffi+mobile-app-apk-emulator: mobile-ffi-android-x86_64mkdir -p mobile/sam-node-app/android/app/src/main/jniLibs/x86_64cp "$(OUT_DIR)/android-x86_64/libsam.so" mobile/sam-node-app/android/app/src/main/jniLibs/x86_64/libsam.socd mobile/sam-node-app && flutter build apk --releasediff --git a/mobile/mobile_e2e.sh b/mobile/mobile_e2e.shindex 908f4a72..c92cd43b 100755--- a/mobile/mobile_e2e.sh+++ b/mobile/mobile_e2e.sh@@ -40,10 +40,10 @@ fi# 2. Build host binariesmake build-# 3. Build Android FFI library using the Makefile and copy to Flutter jniLibs-make mobile-ffi-android-mkdir -p mobile/sam-node-app/android/app/src/main/jniLibs/arm64-v8a-cp bin/android/libsam.so mobile/sam-node-app/android/app/src/main/jniLibs/arm64-v8a/libsam.so+# 3. Build Android x86_64 FFI library using the Makefile and copy to Flutter jniLibs+make mobile-ffi-android-x86_64+mkdir -p mobile/sam-node-app/android/app/src/main/jniLibs/x86_64+cp bin/android-x86_64/libsam.so mobile/sam-node-app/android/app/src/main/jniLibs/x86_64/libsam.so# 4. Start the mock OIDC serverpython3 tests/e2e/docker/mock_oidc.py &