From 40b10eaf75b4e8a7d3e789f7f9026a9edc5a1125 Mon Sep 17 00:00:00 2001
From: larpon <768942+larpon@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:22:35 +0200
Subject: [PATCH 1/4] ci: update ci_emulator_run.yml

---
 .github/workflows/ci_emulator_run.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_emulator_run.yml b/.github/workflows/ci_emulator_run.yml
index 961736b..6b9bb98 100644
--- a/.github/workflows/ci_emulator_run.yml
+++ b/.github/workflows/ci_emulator_run.yml
@@ -84,7 +84,7 @@ jobs:
       if: steps.cache-emulator.outputs.cache-hit != 'true'
       run: |
         export ANDROID_SDK_ROOT="/usr/local/lib/android/sdk"
-        echo yes | $ANDROID_SDK_ROOT/tools/bin/sdkmanager 'system-images;android-30;aosp_atd;x86_64'
+        echo yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager 'system-images;android-30;aosp_atd;x86_64'
         echo no | $ANDROID_SDK_ROOT/tools/bin/avdmanager create avd --force --name test --abi aosp_atd/x86_64 --package 'system-images;android-30;aosp_atd;x86_64'
 
     - name: Run `vab test-all`

From 91ccea3ec2b8a132e9920714a36c25966408e750 Mon Sep 17 00:00:00 2001
From: larpon <768942+larpon@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:15:03 +0200
Subject: [PATCH 2/4] ci: fix avdmanager location in ci_emulator_run.yml

---
 .github/workflows/ci_emulator_run.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_emulator_run.yml b/.github/workflows/ci_emulator_run.yml
index 6b9bb98..a32f51c 100644
--- a/.github/workflows/ci_emulator_run.yml
+++ b/.github/workflows/ci_emulator_run.yml
@@ -85,7 +85,7 @@ jobs:
       run: |
         export ANDROID_SDK_ROOT="/usr/local/lib/android/sdk"
         echo yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager 'system-images;android-30;aosp_atd;x86_64'
-        echo no | $ANDROID_SDK_ROOT/tools/bin/avdmanager create avd --force --name test --abi aosp_atd/x86_64 --package 'system-images;android-30;aosp_atd;x86_64'
+        echo no | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/avdmanager create avd --force --name test --abi aosp_atd/x86_64 --package 'system-images;android-30;aosp_atd;x86_64'
 
     - name: Run `vab test-all`
       run: |

From d20f8b473805cd0d8a53450f9a686bf40cd8de93 Mon Sep 17 00:00:00 2001
From: larpon <768942+larpon@users.noreply.github.com>
Date: Thu, 26 Sep 2024 21:02:48 +0200
Subject: [PATCH 3/4] ci: do not pass deployment flags on ubuntu in
 ci_emulator_run.yml

---
 .github/workflows/ci_emulator_run.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_emulator_run.yml b/.github/workflows/ci_emulator_run.yml
index a32f51c..6acb875 100644
--- a/.github/workflows/ci_emulator_run.yml
+++ b/.github/workflows/ci_emulator_run.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 35
     env:
-      VAB_FLAGS: -cg -f '-d no_load_styles' -v 3 --api 30 --build-tools 33.0.2 --device auto --log-clear --archs x86_64
+      VAB_FLAGS: -cg -f '-d no_load_styles' -v 3 --api 30 --build-tools 33.0.2 --archs x86_64
       VFLAGS: -no-parallel
     steps:
     - uses: actions/setup-java@v4

From a6e7c60f6e3b7f3929ee8f9c95a110ce63f32448 Mon Sep 17 00:00:00 2001
From: larpon <768942+larpon@users.noreply.github.com>
Date: Thu, 26 Sep 2024 21:21:20 +0200
Subject: [PATCH 4/4] ci: build all archs for now ci_emulator_run.yml

---
 .github/workflows/ci_emulator_run.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_emulator_run.yml b/.github/workflows/ci_emulator_run.yml
index 6acb875..b56c008 100644
--- a/.github/workflows/ci_emulator_run.yml
+++ b/.github/workflows/ci_emulator_run.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 35
     env:
-      VAB_FLAGS: -cg -f '-d no_load_styles' -v 3 --api 30 --build-tools 33.0.2 --archs x86_64
+      VAB_FLAGS: -cg -f '-d no_load_styles' -v 3 --api 30 --build-tools 33.0.2
       VFLAGS: -no-parallel
     steps:
     - uses: actions/setup-java@v4