Install Android build-tools 30.0.1 on all machines

bazelbuild · Aug 21, 2020 · 050153d · 050153d
1 parent 74e3e99
commit 050153d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/buildkite/android.sh b/buildkite/android.sh
@@ -20,7 +20,10 @@ rm android-sdk.zip
 yes | tools/bin/sdkmanager --licenses > /dev/null
 tools/bin/sdkmanager --update
 tools/bin/sdkmanager \
+ "build-tools;28.0.2" \
  "build-tools;29.0.2" \
+ "build-tools;29.0.3" \
+ "build-tools;30.0.1" \
  "emulator" \
  "extras;android;m2repository" \
  "platform-tools" \

diff --git a/buildkite/setup-docker.sh b/buildkite/setup-docker.sh
@@ -206,10 +206,9 @@ EOF
  tools/bin/sdkmanager --update
  tools/bin/sdkmanager \
  "build-tools;28.0.2" \
- "build-tools;28.0.3" \
- "build-tools;29.0.0" \
  "build-tools;29.0.2" \
  "build-tools;29.0.3" \
+ "build-tools;30.0.1" \
  "emulator" \
  "extras;android;m2repository" \
  "platform-tools" \

diff --git a/buildkite/setup-windows.ps1 b/buildkite/setup-windows.ps1
@@ -235,10 +235,9 @@ Remove-Item "${android_sdk_root}\tools.old" -Force -Recurse
 ## Install all required Android SDK components.
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "platform-tools"
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "build-tools;28.0.2"
-& "${android_sdk_root}\tools\bin\sdkmanager.bat" "build-tools;28.0.3"
-& "${android_sdk_root}\tools\bin\sdkmanager.bat" "build-tools;29.0.0"
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "build-tools;29.0.2"
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "build-tools;29.0.3"
+& "${android_sdk_root}\tools\bin\sdkmanager.bat" "build-tools;30.0.1"
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "platforms;android-24"
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "platforms;android-28"
 & "${android_sdk_root}\tools\bin\sdkmanager.bat" "extras;android;m2repository"

diff --git a/macos/mac-android.sh b/macos/mac-android.sh
@@ -9,6 +9,7 @@ export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
 # unzip android-ndk.zip > /dev/null
 # rm android-ndk.zip
 
+rm -rf "$HOME/android-sdk"
 mkdir -p "$HOME/android-sdk"
 cd "$HOME/android-sdk"
 curl -fsSL -o android-sdk.zip https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip
@@ -17,13 +18,10 @@ rm android-sdk.zip
 yes | tools/bin/sdkmanager --licenses > /dev/null || true
 tools/bin/sdkmanager --update
 tools/bin/sdkmanager \
- "build-tools;29.0.2" \
- "emulator" \
+ "build-tools;28.0.2" \
+ "build-tools;29.0.3" \
+ "build-tools;30.0.1" \
  "extras;android;m2repository" \
  "platform-tools" \
  "platforms;android-24" \
- "platforms;android-28" \
- "system-images;android-19;default;x86" \
- "system-images;android-21;default;x86" \
- "system-images;android-22;default;x86" \
- "system-images;android-23;default;x86"
+ "platforms;android-28"