From 6aacbd6f913e1cde14bfecf1a73cd686b63bd6f1 Mon Sep 17 00:00:00 2001
From: ahumesky <ahumesky@google.com>
Date: Fri, 11 Jun 2021 17:34:03 -0400
Subject: [PATCH] Remove `build_tools_version` and `api_level` from workspace
 the file to let android_sdk_repository automatically select the latest
 installed version. See bazelbuild/bazel#13409

---
 android/firebase-cloud-messaging/WORKSPACE |  6 +-----
 tutorial/ci/build.sh                       | 10 ++--------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/android/firebase-cloud-messaging/WORKSPACE b/android/firebase-cloud-messaging/WORKSPACE
index ae33fc0a8..c15e78b51 100644
--- a/android/firebase-cloud-messaging/WORKSPACE
+++ b/android/firebase-cloud-messaging/WORKSPACE
@@ -1,11 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 # Requires ANDROID_HOME set to the path of your Android SDK.
-android_sdk_repository(
-    name = "androidsdk",
-    api_level = 28,
-    build_tools_version = "28.0.2",
-)
+android_sdk_repository(name = "androidsdk")
 
 RULES_JVM_EXTERNAL_TAG = "2.9"
 
diff --git a/tutorial/ci/build.sh b/tutorial/ci/build.sh
index b7c25d5fb..e7b76043f 100755
--- a/tutorial/ci/build.sh
+++ b/tutorial/ci/build.sh
@@ -15,12 +15,8 @@
 # Scripts to compile the tutorial on the CI system
 # This script expect the following environment variable:
 #   $BAZEL_INSTALLER set to the path to the bazel installer
-#   $ANDROID_SDK_PATH, $ANDROID_SDK_API_LEVEL,
-#      $ANDROID_SDK_BUILD_TOOLS_VERSION are respectively the
-#      path to the Android SDK, the API Level of the SDK and
-#      the version of the build tools. If the path isn't defined
-#      the android build won't be tested. The 2 other one are defaulted
-#      to, respectively, "22" and "22.0.1".
+#   $ANDROID_SDK_PATH is the path to the Android SDK. If the path isn't
+#     defined, then the android build won't be tested.
 
 IOS_SDK_VERSION=$(xcrun --sdk iphonesimulator --show-sdk-version)
 
@@ -42,8 +38,6 @@ if [ -n "${ANDROID_SDK_PATH-}" ]; then
 android_sdk_repository(
     name = "androidsdk",
     path = "${ANDROID_SDK_PATH}",
-    api_level = ${ANDROID_SDK_API_LEVEL:-22},
-    build_tools_version = "${ANDROID_SDK_BUILD_TOOLS_VERSION:-22.0.1}",
 )
 EOF
   # Revert change to workspace