From b19ca13e6d86f10abe8653ba56a5a2c4bebae9d6 Mon Sep 17 00:00:00 2001
From: edgchen1 <18449977+edgchen1@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:04:44 -0700
Subject: [PATCH 1/2] Move CI build agents to MacOS 13.

---
 .pipelines/android_packaging.yml                       | 4 +---
 .pipelines/ci.yml                                      | 4 +---
 .pipelines/templates/android-shared-lib-build.yml      | 4 +---
 .pipelines/templates/build-package-for-android-aar.yml | 4 +---
 tools/utils/android.py                                 | 2 ++
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.pipelines/android_packaging.yml b/.pipelines/android_packaging.yml
index 8e54d9dc5..a7534e0a0 100644
--- a/.pipelines/android_packaging.yml
+++ b/.pipelines/android_packaging.yml
@@ -3,9 +3,7 @@
 jobs:
   - job: AndroidPackaging
     pool:
-      # We need macOS-12 to run the Android emulator for now.
-      # https://github.com/actions/runner-images/issues/7671
-      vmImage: "macOS-12"
+      vmImage: "macOS-13"
     timeoutInMinutes: 120
     variables:
       buildConfig: Release
diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml
index 720ed0124..e310f749a 100644
--- a/.pipelines/ci.yml
+++ b/.pipelines/ci.yml
@@ -368,9 +368,7 @@ jobs:
   #############
   - job: AndroidPackage
     pool:
-      # We need macOS-12 to run the Android emulator for now.
-      # https://github.com/actions/runner-images/issues/7671
-      vmImage: 'macOS-12'
+      vmImage: 'macOS-13'
     timeoutInMinutes: 120
     steps:
       - task: UsePythonVersion@0
diff --git a/.pipelines/templates/android-shared-lib-build.yml b/.pipelines/templates/android-shared-lib-build.yml
index f12a1016a..5925b43a8 100644
--- a/.pipelines/templates/android-shared-lib-build.yml
+++ b/.pipelines/templates/android-shared-lib-build.yml
@@ -21,9 +21,7 @@ parameters:
 jobs:
   - job: Android_C_API_Packaging_${{ parameters.JobSuffix }}
     pool:
-      # We need macOS-12 to run the Android emulator for now.
-      # https://github.com/actions/runner-images/issues/7671
-      vmImage: "macOS-12"
+      vmImage: "macOS-13"
     timeoutInMinutes: 120
     variables:
       buildConfig: Release
diff --git a/.pipelines/templates/build-package-for-android-aar.yml b/.pipelines/templates/build-package-for-android-aar.yml
index 1ea69946c..835808790 100644
--- a/.pipelines/templates/build-package-for-android-aar.yml
+++ b/.pipelines/templates/build-package-for-android-aar.yml
@@ -40,9 +40,7 @@ stages:
     - Android_C_API_Packaging_armeabi_v7a
     - Android_C_API_Packaging_arm64_v8a
     pool:
-      # We need macOS-12 to run the Android emulator for now.
-      # https://github.com/actions/runner-images/issues/7671
-      vmImage: 'macOS-12'
+      vmImage: 'macOS-13'
     timeoutInMinutes: 120
     variables:
       buildConfig: Release
diff --git a/tools/utils/android.py b/tools/utils/android.py
index a0a7cbe58..b5f3e75a8 100644
--- a/tools/utils/android.py
+++ b/tools/utils/android.py
@@ -111,6 +111,8 @@ def start_emulator(
             "-no-audio",
             "-no-boot-anim",
             "-no-window",
+            "-gpu",
+            "guest",
         ]
         if extra_args is not None:
             emulator_args += extra_args

From c04f5d1b0a0b16388c5da2c32dd17aab69d9676c Mon Sep 17 00:00:00 2001
From: edgchen1 <18449977+edgchen1@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:16:25 -0700
Subject: [PATCH 2/2] Use 'swiftshader_indirect' value.

---
 tools/utils/android.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/utils/android.py b/tools/utils/android.py
index b5f3e75a8..d14ef9eaa 100644
--- a/tools/utils/android.py
+++ b/tools/utils/android.py
@@ -112,7 +112,7 @@ def start_emulator(
             "-no-boot-anim",
             "-no-window",
             "-gpu",
-            "guest",
+            "swiftshader_indirect",
         ]
         if extra_args is not None:
             emulator_args += extra_args