commit 8c803b4f972ad274f35941c2c186cd86d37132ea
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 31 10:36:17 2022 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue May 31 08:43:40 2022 +0000
tree 3f3633515c31755e29ceb8bde0bff424b0e1b833
parent 5cb4f2f7bc6ca2c15ea335f16c41532d744c1e7e

Align before signing in apk_masseur.py

Change-Id: Ibd3816a8067ccd8cc8729a55f1ec83a5c50dd86c

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index 85fda69..363cc18 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -159,8 +159,18 @@
       ANDROID_HOME_ENVIROMENT_NAME, os.path.join(USER_HOME, 'Android', 'Sdk'))
 
 def getAndroidBuildTools():
-  version = os.environ.get(ANDROID_TOOLS_VERSION_ENVIRONMENT_NAME, '28.0.3')
-  return os.path.join(getAndroidHome(), 'build-tools', version)
+  if ANDROID_TOOLS_VERSION_ENVIRONMENT_NAME in os.environ:
+    version = os.environ.get(ANDROID_TOOLS_VERSION_ENVIRONMENT_NAME)
+    build_tools_dir = os.path.join(getAndroidHome(), 'build-tools', version)
+    assert os.path.exists(build_tools_dir)
+    return build_tools_dir
+  else:
+    versions = ['30.0.3', '30.0.2', '30.0.1', '30.0.0']
+    for version in versions:
+      build_tools_dir = os.path.join(getAndroidHome(), 'build-tools', version)
+      if os.path.exists(build_tools_dir):
+        return build_tools_dir
+  raise Exception('Unable to find Android build-tools')
 
 def is_python3():
   return sys.version_info.major == 3