Update Android build tools to 36.1.0 and remove old versions (#2408)
Fixes https://github.com/bazelbuild/rules_android/issues/423
diff --git a/buildkite/android.sh b/buildkite/android.sh
index 7cfb0b2..312ddb9 100755
--- a/buildkite/android.sh
+++ b/buildkite/android.sh
@@ -20,8 +20,7 @@
yes | tools/bin/sdkmanager --licenses > /dev/null
tools/bin/sdkmanager --update
tools/bin/sdkmanager \
- "build-tools;28.0.2" \
- "build-tools;30.0.3" \
+ "build-tools;36.1.0" \
"emulator" \
"extras;android;m2repository" \
"platform-tools" \
diff --git a/buildkite/setup-docker.sh b/buildkite/setup-docker.sh
index 83fe441..6a0ee1b 100755
--- a/buildkite/setup-docker.sh
+++ b/buildkite/setup-docker.sh
@@ -187,8 +187,7 @@
yes | latest/bin/sdkmanager --licenses > /dev/null || true
latest/bin/sdkmanager --update
latest/bin/sdkmanager \
- "build-tools;28.0.2" \
- "build-tools;30.0.3" \
+ "build-tools;36.1.0" \
"extras;android;m2repository" \
"platform-tools" \
"platforms;android-24" \
diff --git a/buildkite/setup-windows.ps1 b/buildkite/setup-windows.ps1
index 1e7c033..2675fe4 100755
--- a/buildkite/setup-windows.ps1
+++ b/buildkite/setup-windows.ps1
@@ -262,8 +262,7 @@
## Install all required Android SDK components.
& "${android_sdk_tools_root}\latest\bin\sdkmanager.bat" "platform-tools"
-& "${android_sdk_tools_root}\latest\bin\sdkmanager.bat" "build-tools;28.0.2"
-& "${android_sdk_tools_root}\latest\bin\sdkmanager.bat" "build-tools;30.0.3"
+& "${android_sdk_tools_root}\latest\bin\sdkmanager.bat" "build-tools;36.1.0"
& "${android_sdk_tools_root}\latest\bin\sdkmanager.bat" "platforms;android-24"
& "${android_sdk_tools_root}\latest\bin\sdkmanager.bat" "platforms;android-28"
& "${android_sdk_tools_root}\latest\bin\sdkmanager.bat" "platforms;android-29"
diff --git a/macos/mac-android.sh b/macos/mac-android.sh
index 47dca30..b86421f 100644
--- a/macos/mac-android.sh
+++ b/macos/mac-android.sh
@@ -26,8 +26,7 @@
yes | latest/bin/sdkmanager --licenses > /dev/null || true
latest/bin/sdkmanager --update
latest/bin/sdkmanager \
- "build-tools;28.0.2" \
- "build-tools;30.0.3" \
+ "build-tools;36.1.0" \
"extras;android;m2repository" \
"platform-tools" \
"platforms;android-24" \