Merge remote-tracking branch 'pr/ci/add-linux-emulator-runs' into ci/…

…add-linux-emulator-runs
larpon · Sep 27, 2024 · 833f4f9 · 833f4f9
2 parents e9d401a + a6e7c60
commit 833f4f9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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
       VFLAGS: -no-parallel
     steps:
     - uses: actions/setup-java@v4
@@ -84,8 +84,8 @@ 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 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 yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager '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: |