From e2418c1151b89197a56b7436a52de6f82f029e34 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Tue, 3 Sep 2024 17:37:12 +0200
Subject: [PATCH] test: update to android-34 SDK (Android 14)

---
 utils/avd_install.sh  | 2 +-
 utils/avd_recreate.sh | 6 +++---
 utils/avd_start.sh    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/utils/avd_install.sh b/utils/avd_install.sh
index 6beb8bf43f..9538719eea 100755
--- a/utils/avd_install.sh
+++ b/utils/avd_install.sh
@@ -24,7 +24,7 @@ echo Installing emulator...
 yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install platform-tools emulator
 
 echo Installing platform SDK...
-yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-33"
+yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-34"
 
 echo Starting ADB...
 ${ANDROID_HOME}/platform-tools/adb devices
diff --git a/utils/avd_recreate.sh b/utils/avd_recreate.sh
index 0877e76ed1..0b2c08861e 100755
--- a/utils/avd_recreate.sh
+++ b/utils/avd_recreate.sh
@@ -13,7 +13,7 @@ if [[ "$(uname -m)" == "arm64" ]]; then
     ANDROID_ARCH="arm64-v8a"
 fi
 
-${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android33 || true
-yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-33;google_apis;$ANDROID_ARCH" platform-tools emulator
-echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android33 --device "Nexus 5X" --package "system-images;android-33;google_apis;$ANDROID_ARCH"
+${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android34 || true
+yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-34;google_apis;$ANDROID_ARCH" platform-tools emulator
+echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android34 --device "Nexus 5X" --package "system-images;android-34;google_apis;$ANDROID_ARCH"
 ${ANDROID_HOME}/emulator/emulator -list-avds
diff --git a/utils/avd_start.sh b/utils/avd_start.sh
index 67acb1c63e..e054187895 100755
--- a/utils/avd_start.sh
+++ b/utils/avd_start.sh
@@ -9,15 +9,15 @@ fi
 bash $PWD/utils/avd_stop.sh
 
 echo "Starting emulator"
-# nohup ${ANDROID_HOME}/emulator/emulator -avd android33 -gpu swiftshader &
-nohup ${ANDROID_HOME}/emulator/emulator -avd android33 -no-audio -no-window -no-boot-anim -no-snapshot &
+# nohup ${ANDROID_HOME}/emulator/emulator -avd android34 -gpu swiftshader &
+nohup ${ANDROID_HOME}/emulator/emulator -avd android34 -no-audio -no-window -no-boot-anim -no-snapshot &
 ${ANDROID_HOME}/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82'
 ${ANDROID_HOME}/platform-tools/adb devices
 echo "Emulator started"
 
 echo "Installing Chromium WebView"
 # See here for the latest revision: https://storage.googleapis.com/chromium-browser-snapshots/Android/LAST_CHANGE
-CHROMIUM_ANDROID_REVISION="1190572"
+CHROMIUM_ANDROID_REVISION="1340145"
 WEBVIEW_TMP_DIR="$(mktemp -d)"
 WEBVIEW_TMP_FILE="$WEBVIEW_TMP_DIR/chrome-android-zip"
 curl -s -o "${WEBVIEW_TMP_FILE}" "https://storage.googleapis.com/chromium-browser-snapshots/Android/${CHROMIUM_ANDROID_REVISION}/chrome-android.zip"