commit e1018bf7792c037b3db871c52abdaf87786444ed
author Philipp Wollermann <philwo@google.com> Thu Jul 01 23:30:50 2021 +0200
committer Philipp Wollermann <philwo@google.com> Sat Aug 07 09:11:39 2021 +0200
tree 72ea89cc2e48af0ac5a32fb86f9843c9210608b9
parent c0fb04939b5da83516146af4481e49458a9ce811

Upgrade Android SDK to latest version in Linux VM

buildkite/setup-docker.sh

diff --git a/buildkite/setup-docker.sh b/buildkite/setup-docker.sh
index 42b8632..7fd7857 100755
--- a/buildkite/setup-docker.sh
+++ b/buildkite/setup-docker.sh
@@ -185,14 +185,15 @@
 
 ### Install Android SDK.
 {
-  mkdir -p /opt/android-sdk-linux
-  cd /opt/android-sdk-linux
-  curl -fsSL -o android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
+  mkdir -p /opt/android-sdk-linux/cmdline-tools
+  cd /opt/android-sdk-linux/cmdline-tools
+  curl -fsSL -o android-sdk.zip https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip
   unzip android-sdk.zip > /dev/null
   rm android-sdk.zip
-  yes | tools/bin/sdkmanager --licenses > /dev/null || true
-  tools/bin/sdkmanager --update
-  tools/bin/sdkmanager \
+  mv cmdline-tools latest
+  yes | latest/bin/sdkmanager --licenses > /dev/null || true
+  latest/tools/bin/sdkmanager --update
+  latest/tools/bin/sdkmanager \
       "build-tools;28.0.2" \
       "build-tools;29.0.2" \
       "build-tools;29.0.3" \