From f8a109cbf49c007dbe832dfc9918db5d1d511964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Cotty?= <raphael.cotty@gmail.com>
Date: Mon, 2 Nov 2020 19:50:40 +0100
Subject: Android: Update sdk/ndk/tools versions

build-tools: 29.0.3
NDK: 21.3.6528147
SDK Platform: 29

Change-Id: I6d281aa2e914d7567fa2d57698146465b41838d7
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
---
 docker-compose.yml                    |  8 ++++----
 docker/focal/test-android.Dockerfile  | 24 ++++++++++++------------
 share/qbs/modules/Android/sdk/sdk.qbs |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 83f629e44..45424a35c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,7 @@ services:
   focal-android-513:
     << : *linux
     hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.13.2-1
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.13.2-2
     build:
       dockerfile: docker/focal/test-android.Dockerfile
       context: .
@@ -41,7 +41,7 @@ services:
   focal-android-514:
     << : *linux
     hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.14.0-1
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.14.0-2
     build:
       dockerfile: docker/focal/test-android.Dockerfile
       context: .
@@ -51,7 +51,7 @@ services:
   focal-android-515:
     << : *linux
     hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.15.1-1
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.15.1-2
     build:
       dockerfile: docker/focal/test-android.Dockerfile
       context: .
@@ -61,7 +61,7 @@ services:
   focal-android-600:
     << : *linux
     hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.0.0-0
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.0.0-1
     build:
       dockerfile: docker/focal/test-android.Dockerfile
       context: .
diff --git a/docker/focal/test-android.Dockerfile b/docker/focal/test-android.Dockerfile
index 8ded72c37..72c84ca0c 100644
--- a/docker/focal/test-android.Dockerfile
+++ b/docker/focal/test-android.Dockerfile
@@ -49,11 +49,11 @@ RUN echo "export JAVA_HOME=${JAVA_HOME}" > /etc/profile.d/android.sh && \
 ENV ANDROID_HOME="/home/${USER_NAME}/android"
 ENV ANDROID_SDK_ROOT=${ANDROID_HOME}
 ENV ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk-bundle
-ENV PATH="${JAVA_HOME}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools/bin:$PATH"
+ENV PATH="${JAVA_HOME}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin:$PATH"
 RUN echo "export ANDROID_HOME=/home/${USER_NAME}/android" >> /etc/profile.d/android.sh && \
     echo "export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" >> /etc/profile.d/android.sh && \
     echo "export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}" >> /etc/profile.d/android.sh && \
-    echo "export PATH=${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools/bin:\$PATH" >> /etc/profile.d/android.sh
+    echo "export PATH=${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin:\$PATH" >> /etc/profile.d/android.sh
 
 #
 # We ned to run the following steps as the target user
@@ -61,18 +61,18 @@ RUN echo "export ANDROID_HOME=/home/${USER_NAME}/android" >> /etc/profile.d/andr
 USER ${USER_NAME}
 RUN mkdir ${ANDROID_HOME}
 
-# Get Android SDK TOOLS
-ARG SDK_TOOLS_VERSION="4333796"
-RUN curl -s https://dl.google.com/android/repository/sdk-tools-linux-${SDK_TOOLS_VERSION}.zip > ${ANDROID_HOME}/sdk.zip && \
-    unzip ${ANDROID_HOME}/sdk.zip -d ${ANDROID_HOME} && \
-    rm -v ${ANDROID_HOME}/sdk.zip
+# Get Android command line tools
+ARG COMMAND_LINE_TOOLS_VERSION="6858069"
+RUN curl -s https://dl.google.com/android/repository/commandlinetools-linux-${COMMAND_LINE_TOOLS_VERSION}_latest.zip > ${ANDROID_HOME}/commandlinetools.zip && \
+    unzip ${ANDROID_HOME}/commandlinetools.zip -d ${ANDROID_HOME} && \
+    rm -v ${ANDROID_HOME}/commandlinetools.zip
 
 # Accept SDK license
 ARG ANDROID_PLATFORM="android-29"
-ARG BUILD_TOOLS="28.0.3"
-RUN yes | sdkmanager --verbose --licenses && \
-          sdkmanager --update && \
-          sdkmanager "platforms;${ANDROID_PLATFORM}" "build-tools;${BUILD_TOOLS}" "platform-tools" "tools" "ndk-bundle" && \
+ARG BUILD_TOOLS="29.0.2"
+RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" --verbose --licenses && \
+          sdkmanager "--sdk_root=${ANDROID_HOME}" --update && \
+          sdkmanager "--sdk_root=${ANDROID_HOME}" "platforms;${ANDROID_PLATFORM}" "build-tools;${BUILD_TOOLS}" "platform-tools" "tools" "ndk-bundle" && \
     /usr/lib/jvm/java-8-openjdk-amd64/bin/keytool -genkey -keystore /home/${USER_NAME}/.android/debug.keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname 'CN=Android Debug,O=Android,C=US'
 
 # Install ndk samples in ${ANDROID_NDK_ROOT}/samples
@@ -92,7 +92,7 @@ RUN mkdir ${ANDROID_SDK_ROOT}/samples && \
 
 # Download buildtool to generate aab packages in ${ANDROID_SDK_ROOT}
 RUN cd ${ANDROID_SDK_ROOT} && \
-    curl -sLO https://github.com/google/bundletool/releases/download/0.15.0/bundletool-all-0.15.0.jar
+    curl -sLO https://github.com/google/bundletool/releases/download/1.3.0/bundletool-all-1.3.0.jar
 
 USER root
 
diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs
index 32aae89d9..b3f977689 100644
--- a/share/qbs/modules/Android/sdk/sdk.qbs
+++ b/share/qbs/modules/Android/sdk/sdk.qbs
@@ -55,7 +55,7 @@ Module {
         platformSearchPaths: [Android.sdk.sdkDir]
         names: ["bundletool-all"]
         nameSuffixes: ["-0.11.0.jar", "-0.12.0.jar", "-0.13.0.jar", "-0.13.3.jar", "-0.13.4.jar",
-            "-0.14.0.jar", "-0.15.0.jar"]
+            "-0.14.0.jar", "-0.15.0.jar", "-1.0.0.jar", "-1.1.0.jar", "-1.2.0.jar", "-1.3.0.jar"]
     }
 
     property path sdkDir: sdkProbe.path
-- 
cgit v1.2.3