From 45a0ed0b9820665a58c9b022dfa7a06423cf8841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20Wr=C3=B3tniak?= <karol.wrotniak@droidsonroids.pl>
Date: Tue, 22 Sep 2020 03:25:39 +0200
Subject: [PATCH] Add Build tools 30.0.2. Replace ANDROID_HOME with
 ANDROID_SDK_ROOT

---
 CHANGELOG.md |  7 +++++++
 Dockerfile   | 16 +++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce8a8a5..d4e7500 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## UPCOMING
 
+## `v2020_09_22_1`
+
+* new preinstalled package: `build-tools-30.0.2`
+* Deprecated ANDROID_HOME replaced with ANDROID_SDK_ROOT
+
+https://github.com/bitrise-docker/android/pull/318
+
 ## `v2020_06_14_1`
 
 * Deprecated SDK tools replaced with Command line Tools: https://github.com/bitrise-docker/android/pull/300
diff --git a/Dockerfile b/Dockerfile
index d266ceb..bb52ce8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 FROM quay.io/bitriseio/bitrise-base:alpha
 
+ENV ANDROID_SDK_ROOT /opt/android-sdk-linux
+# Preserved for backwards compatibility
 ENV ANDROID_HOME /opt/android-sdk-linux
 
-
 # ------------------------------------------------------
 # --- Install required tools
 
@@ -18,15 +19,15 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-8-jdk libc6:i386 l
 
 
 # ------------------------------------------------------
-# --- Download Android Command line Tools into $ANDROID_HOME
+# --- Download Android Command line Tools into $ANDROID_SDK_ROOT
 
 RUN cd /opt \
     && wget -q https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O android-commandline-tools.zip \
-    && mkdir -p ${ANDROID_HOME}/cmdline-tools \
-    && unzip -q android-commandline-tools.zip -d ${ANDROID_HOME}/cmdline-tools \
+    && mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools \
+    && unzip -q android-commandline-tools.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools \
     && rm android-commandline-tools.zip
 
-ENV PATH ${PATH}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/tools/bin
+ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin
 
 # ------------------------------------------------------
 # --- Install Android SDKs and other build packages
@@ -66,6 +67,7 @@ RUN yes | sdkmanager \
     "platforms;android-19" \
     "platforms;android-17" \
     "platforms;android-15" \
+    "build-tools;30.0.2" \
     "build-tools;30.0.0" \
     "build-tools;29.0.3" \
     "build-tools;29.0.2" \
@@ -177,7 +179,7 @@ RUN npm install -g firebase-tools
 # Required for Android ARM Emulator
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libqt5widgets5
 ENV QT_QPA_PLATFORM offscreen
-ENV LD_LIBRARY_PATH ${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib
+ENV LD_LIBRARY_PATH ${ANDROID_SDK_ROOT}/emulator/lib64:${ANDROID_SDK_ROOT}/emulator/lib64/qt/lib
 
 # -------------------------------------------------------
 # Tools to parse apk/aab info in deploy-to-bitrise-io step
@@ -195,5 +197,5 @@ RUN cd /opt \
 # Cleaning
 RUN apt-get clean
 
-ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2020_06_14_1
+ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2020_09_22_1
 CMD bitrise -version