From 90d70d82cbc1a86f69690e25e9ea94cf0f5ed539 Mon Sep 17 00:00:00 2001
From: Tom Roush <4317255+TomRoush@users.noreply.github.com>
Date: Wed, 5 Jan 2022 17:54:34 -0600
Subject: [PATCH 1/3] Add minimum API level to CI build matrix

---
 .github/workflows/android-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 479d3c90..b4256779 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -33,6 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         api-level:
+          - 19
           - 31
 
     steps:

From a313dcfd02bf17c58bd8f2aeb6a636aba3b40f81 Mon Sep 17 00:00:00 2001
From: Tom Roush <4317255+TomRoush@users.noreply.github.com>
Date: Wed, 5 Jan 2022 18:03:35 -0600
Subject: [PATCH 2/3] Change arch to support API 19

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

diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index b4256779..9bdcba94 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           target: google_apis
-          arch: x86_64
+          arch: x86
           script: adb logcat *:S TestRunner:V & ./gradlew connectedCheck --no-build-cache --no-daemon --stacktrace
 
   instrumentation-test-summary:

From 868d4ecf0c6bd5bdc9c29ff4463178d70454b5cf Mon Sep 17 00:00:00 2001
From: Tom Roush <4317255+TomRoush@users.noreply.github.com>
Date: Wed, 5 Jan 2022 23:28:26 -0600
Subject: [PATCH 3/3] Increase API to 21 and change arch to x86_64

---
 .github/workflows/android-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 9bdcba94..a283b89a 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         api-level:
-          - 19
+          - 21
           - 31
 
     steps:
@@ -51,7 +51,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           target: google_apis
-          arch: x86
+          arch: x86_64
           script: adb logcat *:S TestRunner:V & ./gradlew connectedCheck --no-build-cache --no-daemon --stacktrace
 
   instrumentation-test-summary:
@@ -90,4 +90,4 @@ jobs:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
\ No newline at end of file
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}