From b306a3ef41dd96ea470c785863b41f849a5a0a6c Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 18 Nov 2020 18:53:06 -0400
Subject: [PATCH] Update Dockerfile to utilize new commandline tools
 distributable.

---
 reproducible-builds/Dockerfile | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile
index 712fa042c..ca2259247 100644
--- a/reproducible-builds/Dockerfile
+++ b/reproducible-builds/Dockerfile
@@ -10,19 +10,20 @@ RUN apt-get update -y && apt-get install -y apt-utils
 RUN apt-get update -y && apt-get install -y $(cat docker/dependencies.txt)
 RUN docker/print-versions.sh docker/dependencies.txt
 
-ENV ANDROID_SDK_FILENAME        android-sdk_r24.4.1-linux.tgz
-ENV ANDROID_API_LEVELS          android-30
-ENV ANDROID_BUILD_TOOLS_VERSION 30.0.2
+ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-6858069_latest.zip
+ENV ANDROID_API_LEVELS                  android-30
+ENV ANDROID_BUILD_TOOLS_VERSION         30.0.2
 
 ENV ANDROID_HOME /usr/local/android-sdk-linux
-ENV PATH         ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+ENV PATH         ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin
 
-RUN cd /usr/local/ && \
-    wget -q "https://dl.google.com/android/${ANDROID_SDK_FILENAME}" && \
-    tar -xzf ${ANDROID_SDK_FILENAME} && \
-    rm ${ANDROID_SDK_FILENAME} 
-RUN echo y | android update sdk --no-ui -a --filter ${ANDROID_API_LEVELS}
-RUN echo y | android update sdk --no-ui -a --filter extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository
-RUN echo y | android update sdk --no-ui -a --filter tools,platform-tools,build-tools-${ANDROID_BUILD_TOOLS_VERSION}
-RUN rm -rf ${ANDROID_HOME}/tools
+RUN cd /usr/local/
+RUN wget -q "https://dl.google.com/android/repository/${ANDROID_COMMAND_LINE_TOOLS_FILENAME}"
+RUN unzip ${ANDROID_COMMAND_LINE_TOOLS_FILENAME} -d /usr/local/android-sdk-linux
+RUN rm ${ANDROID_COMMAND_LINE_TOOLS_FILENAME}
 
+RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
+RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services"
+RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager --licenses --sdk_root="${ANDROID_HOME}"
+
+RUN rm -rf ${ANDROID_HOME}/tools
\ No newline at end of file