dockerfile: update tools

Change-Id: I3eb413fbcf433475e97d63ba77d1e6005bee1107

docker/Dockerfile

@@ -39,31 +39,30 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL
 
 # Android SDK tools
-RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
+RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip && \
 	mkdir -p /opt/android-sdk && \
 	unzip -q -d /opt/android-sdk /tmp/android-tools.zip && \
 	rm -f /tmp/android-tools.zip && \
 	chown -R root:root /opt/android-sdk
 
 # Swig 4.0.1
-RUN wget -O /tmp/swig.tar.gz https://github.com/swig/swig/archive/rel-4.0.1.tar.gz
-RUN tar xzf  /tmp/swig.tar.gz -C /opt
-RUN cd /opt/swig-rel-4.0.1/ && ./autogen.sh && ./configure && make && make install
+RUN wget -O /tmp/swig.tar.gz https://github.com/swig/swig/archive/rel-4.0.1.tar.gz && \
+	tar xzf  /tmp/swig.tar.gz -C /opt && \
+	cd /opt/swig-rel-4.0.1/ && ./autogen.sh && ./configure && make && make install && \
+	cd .. && rm -rf /opt/swig-rel-4.0.1 /tmp/swig.tar.gz
 
 ENV ANDROID_HOME=/opt/android-sdk
 ENV PATH=${PATH}:${ANDROID_HOME}/tools/bin
-RUN (while sleep 1; do echo "y"; done) | sdkmanager --update
 
 # Android SDK libraries, NDK
-ENV ANDROID_DEPS=\
-'build-tools;29.0.2 \
- platforms;android-29 \
- extras;android;m2repository \
- extras;google;m2repository \
- ndk;21.0.6113669'
-RUN (while sleep 1; do echo "y"; done) | sdkmanager $ANDROID_DEPS
-ENV ANDROID_SDK=/opt/android-sdk
-ENV ANDROID_NDK=/opt/android-sdk/ndk/21.0.6113669
+RUN sdkmanager --sdk_root=${ANDROID_HOME} --update
+RUN (while sleep 1; do echo "y"; done) | sdkmanager --sdk_root=${ANDROID_HOME} 'build-tools;29.0.3' \
+	'platforms;android-29'\
+	'extras;android;m2repository'\
+	'extras;google;m2repository'\
+	'ndk;21.1.6352462'
+ENV ANDROID_SDK=${ANDROID_HOME}
+ENV ANDROID_NDK=${ANDROID_HOME}/ndk/21.1.6352462
 
 WORKDIR /home/builder/src
 VOLUME /home/builder/src

ring-android/app/build.gradle

@@ -4,8 +4,8 @@ def buildFirebase = project.hasProperty('buildFirebase') || getGradle().getStart
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.2'
-    ndkVersion "21.0.6113669"
+    buildToolsVersion '29.0.3'
+    ndkVersion "21.1.6352462"
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29