From 673af065f7269b81eaa470e5e1bef6a06a7dee38 Mon Sep 17 00:00:00 2001
From: Matt Creaser <mattwcc@amazon.com>
Date: Fri, 9 Dec 2022 13:51:39 -0400
Subject: [PATCH] Try using custom commands to install Android SDK 31

---
 scripts/pr-builder-buildspec.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/pr-builder-buildspec.yml b/scripts/pr-builder-buildspec.yml
index 2cc62d3f4d..10032daef9 100644
--- a/scripts/pr-builder-buildspec.yml
+++ b/scripts/pr-builder-buildspec.yml
@@ -16,11 +16,23 @@ env:
 phases:
   install:
     runtime-versions:
-      android: 29
       nodejs: 12
       java: corretto11
     commands:
       - echo 'Install phase starting'
+      ### INSTALL ANDROID 31
+      - export ANDROID_TOOLS_FILENAME="commandlinetools-linux-9123335_latest.zip"
+      - wget https://dl.google.com/android/repository/$ANDROID_TOOLS_FILENAME -P ~ > /dev/null
+      - unzip ~/$ANDROID_TOOLS_FILENAME -d ~ > /dev/null 2>&1
+      - mkdir -p /usr/local/android-sdk-linux/cmdline-tools
+      - mv ~/cmdline-tools /usr/local/android-sdk-linux/cmdline-tools/latest
+      - export PATH=/usr/local/android-sdk-linux/cmdline-tools/latest:/usr/local/android-sdk-linux/cmdline-tools/latest/bin:/usr/local/android-sdk-linux/platform-tools:$PATH
+      - export ANDROID_SDK_ROOT=/usr/local/android-sdk-linux
+      - which sdkmanager
+      - yes | sdkmanager --licenses > /dev/null
+      - sdkmanager "platform-tools" "platforms;android-31" > /dev/null
+      - sdkmanager "build-tools;31.0.0" > /dev/null
+      ### END INSTALL ANDROID 31
     finally:
       - echo 'Install phase completed.'
   pre_build: