From 85e33f88b1386bddc63f340365bbb461e3f8b724 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Thu, 26 Jan 2023 19:40:49 +0100
Subject: [PATCH] Android CI based on GitHub Image (#712)

---
 .github/workflows/android-ci-pull.yml         |  16 ++---
 .github/workflows/android-ci.yml              |  19 ++----
 .github/workflows/android-docker-base.yml     |  29 ---------
 .github/workflows/android-docker-ndk-r21b.yml |  29 ---------
 .github/workflows/android-release.yml         |   8 +--
 benchmark/android/app/build.gradle            |   6 +-
 .../android/MapboxGLAndroidSDK/build.gradle   |   1 +
 platform/android/docker/README.md             |   5 --
 platform/android/docker/android-base          |  57 ------------------
 platform/android/docker/android-ndk-r21b      |  41 -------------
 .../filesystem/apt-google-cloud-sdk.tar.gz    | Bin 1837 -> 0 bytes
 .../android/docker/filesystem/apt-llvm.tar.gz | Bin 2915 -> 0 bytes
 .../docker/filesystem/apt-toolchain.tar.gz    | Bin 783 -> 0 bytes
 .../apt/sources.list.d/google-cloud-sdk.list  |   1 -
 .../etc/apt/sources.list.d/llvm.list          |   2 -
 .../etc/apt/sources.list.d/toolchain.list     |   2 -
 .../docker/filesystem/libsysconfcpus.tar.gz   | Bin 3857 -> 0 bytes
 .../filesystem/tmp/google-cloud-sdk.gpg       | Bin 1326 -> 0 bytes
 .../android/docker/filesystem/tmp/llvm.gpg    | Bin 2236 -> 0 bytes
 .../docker/filesystem/tmp/toolchain.gpg       | Bin 355 -> 0 bytes
 platform/android/gradle/dependencies.gradle   |   6 ++
 platform/android/gradle/native-build.gradle   |   5 +-
 22 files changed, 27 insertions(+), 200 deletions(-)
 delete mode 100644 .github/workflows/android-docker-base.yml
 delete mode 100644 .github/workflows/android-docker-ndk-r21b.yml
 delete mode 100644 platform/android/docker/README.md
 delete mode 100644 platform/android/docker/android-base
 delete mode 100644 platform/android/docker/android-ndk-r21b
 delete mode 100644 platform/android/docker/filesystem/apt-google-cloud-sdk.tar.gz
 delete mode 100644 platform/android/docker/filesystem/apt-llvm.tar.gz
 delete mode 100644 platform/android/docker/filesystem/apt-toolchain.tar.gz
 delete mode 100644 platform/android/docker/filesystem/etc/apt/sources.list.d/google-cloud-sdk.list
 delete mode 100644 platform/android/docker/filesystem/etc/apt/sources.list.d/llvm.list
 delete mode 100644 platform/android/docker/filesystem/etc/apt/sources.list.d/toolchain.list
 delete mode 100644 platform/android/docker/filesystem/libsysconfcpus.tar.gz
 delete mode 100644 platform/android/docker/filesystem/tmp/google-cloud-sdk.gpg
 delete mode 100644 platform/android/docker/filesystem/tmp/llvm.gpg
 delete mode 100644 platform/android/docker/filesystem/tmp/toolchain.gpg

diff --git a/.github/workflows/android-ci-pull.yml b/.github/workflows/android-ci-pull.yml
index d32ec7d00..8cd743ba9 100644
--- a/.github/workflows/android-ci-pull.yml
+++ b/.github/workflows/android-ci-pull.yml
@@ -28,14 +28,11 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: platform/android
-    container:
-      image: ghcr.io/maplibre/android-ndk-r21b
     env:
-      LIBSYSCONFCPUS: 8
       JOBS: 8
       BUILDTYPE: Debug
       IS_LOCAL_DEVELOPMENT: false
@@ -47,14 +44,6 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-          
-      - name: Setup Android SDK for accepting tool licenses
-        uses: android-actions/setup-android@v2
-
       - name: Cache node modules
         uses: actions/cache@v3
         env:
@@ -71,6 +60,9 @@ jobs:
         run: npm install --ignore-scripts
         working-directory: platform/android
 
+      - name: Install ccache
+        run: sudo apt-get install -y ccache
+
       - name: Prepare ccache
         run: ccache --clear
 
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 87a70c6a6..88d3a1516 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -25,17 +25,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: platform/android
-    container:
-      image: ghcr.io/maplibre/android-ndk-r21b
-      credentials:
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.CR_PAT }}
     env:
-      LIBSYSCONFCPUS: 8
       JOBS: 8
       BUILDTYPE: Debug
       IS_LOCAL_DEVELOPMENT: false
@@ -47,14 +41,6 @@ jobs:
           submodules: recursive
           fetch-depth: 0
       
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-
-      - name: Setup Android SDK for accepting tool licenses
-        uses: android-actions/setup-android@v2
-        
       - name: Cache node modules
         uses: actions/cache@v3
         env:
@@ -70,6 +56,9 @@ jobs:
       - name: npm install
         run: npm install --ignore-scripts
 
+      - name: Install ccache
+        run: sudo apt-get install -y ccache
+
       - name: Prepare ccache
         run: ccache --clear
 
diff --git a/.github/workflows/android-docker-base.yml b/.github/workflows/android-docker-base.yml
deleted file mode 100644
index a82292184..000000000
--- a/.github/workflows/android-docker-base.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: android-base-docker-image
-on:
-  workflow_dispatch
-jobs:
-  push_to_registry:
-    name: Docker image android-base
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to ghcr.io
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
-
-      - name: Build and push android-base image
-        uses: docker/build-push-action@v3
-        with:
-          file: ./platform/android/docker/android-base        
-          context: ./platform/android/docker
-          tags: ghcr.io/maplibre/android-base:latest
-          push: true
\ No newline at end of file
diff --git a/.github/workflows/android-docker-ndk-r21b.yml b/.github/workflows/android-docker-ndk-r21b.yml
deleted file mode 100644
index 3a1eb912c..000000000
--- a/.github/workflows/android-docker-ndk-r21b.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: android-ndk-r21b-docker-image
-on:
-  workflow_dispatch
-jobs:
-  push_to_registry:
-    name: Docker image android-ndk-r21b
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to ghcr.io
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
-
-      - name: Build and push android-ndk-r21b image
-        uses: docker/build-push-action@v3
-        with:
-          file: ./platform/android/docker/android-ndk-r21b        
-          context: ./platform/android/docker
-          tags: ghcr.io/maplibre/android-ndk-r21b:latest
-          push: true          
\ No newline at end of file
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 8d7005c2e..d84418d85 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -5,14 +5,11 @@ on:
 
 jobs:
   build:
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: platform/android
-    container:
-      image: ghcr.io/maplibre/android-ndk-r21b
     env:
-      LIBSYSCONFCPUS: 8
       JOBS: 8
       BUILDTYPE: Release
       IS_LOCAL_DEVELOPMENT: false
@@ -44,6 +41,9 @@ jobs:
         run: npm install --ignore-scripts          
         working-directory: platform/android
 
+      - name: Install ccache
+        run: sudo apt-get install -y ccache
+
       - name: Prepare ccache
         run: ccache --clear       
 
diff --git a/benchmark/android/app/build.gradle b/benchmark/android/app/build.gradle
index 7d5286d50..d7af08c3e 100644
--- a/benchmark/android/app/build.gradle
+++ b/benchmark/android/app/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion androidVersions.compileSdkVersion
+    ndkVersion androidSdkVersions.ndkVersion
+    buildToolsVersion androidSdkVersions.buildToolsVersion
 
     defaultConfig {
         applicationId = 'com.mapbox.mapboxsdk.maps.benchmark_runner'
@@ -32,7 +34,7 @@ android {
     }
     externalNativeBuild {
         cmake {
-            version '3.10.2'
+            version androidSdkVersions.cmakeVersion
             path '../../../CMakeLists.txt'
         }
     }
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index b3a9e2ffe..674a5a0f0 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -34,6 +34,7 @@ dependencies {
 
 android {
     compileSdkVersion androidVersions.compileSdkVersion
+    buildToolsVersion androidSdkVersions.buildToolsVersion
 
     defaultConfig {
         minSdkVersion androidVersions.minSdkVersion
diff --git a/platform/android/docker/README.md b/platform/android/docker/README.md
deleted file mode 100644
index 8d220e2e4..000000000
--- a/platform/android/docker/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-```
-docker build -t maplibre/android-base -f android-base .
-docker build -t maplibre/android-ndk-r21b -f android-ndk-r21b .
-```
\ No newline at end of file
diff --git a/platform/android/docker/android-base b/platform/android/docker/android-base
deleted file mode 100644
index c136ee328..000000000
--- a/platform/android/docker/android-base
+++ /dev/null
@@ -1,57 +0,0 @@
-FROM ubuntu:xenial-20181005
-ENV DEBIAN_FRONTEND="noninteractive"
-
-# Add base filesystems
-ADD filesystem/libsysconfcpus.tar.gz \
-    filesystem/apt-google-cloud-sdk.tar.gz \
-    /
-
-# libsysconfcpus.so can be used to alter the number of CPUs reported by the system
-ENV LD_PRELOAD=/usr/lib/libsysconfcpus.so
-
-# Add apt keys
-RUN set -eu \
- && (find /tmp/*.gpg | xargs -n1 apt-key add) \
- && rm /tmp/*.gpg
-
-# Install base packages
-RUN set -eu \
- && apt-get update \ 
- && apt-get -y install software-properties-common \
- && apt-get update \ 
- && add-apt-repository -y ppa:git-core/ppa \
- && apt-get update \
- && apt-get -y install git curl make python3 python3-pip zip unzip ccache openjdk-11-jdk-headless apt-transport-https \
- && update-alternatives --install /usr/bin/python python /usr/bin/python3 1 \
- && rm -rf /var/lib/apt/lists/*
-
-# Install CLI tools for CI scripting
-RUN set -eu \
- && apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0 \
- && apt-add-repository https://cli.github.com/packages \
- && apt-get update \
- && apt-get -y install jq gh \
- && rm -rf /var/lib/apt/lists/*
-
-# Install Google Cloud SDK
-RUN set -eu \
- && apt-get update \
- && apt-get -y install google-cloud-sdk \
- && rm -rf /var/lib/apt/lists/*
-
-# Install awscli
-RUN set -eu \
- && pip3 install awscli
-
-# Install Node.js
-# Check https://nodejs.org/en/download/releases/ for releases
-ENV NVM_DIR="/root/.nvm" \
-    PATH="/root/.nvm/versions/node/v10.13.0/bin:$PATH"
-RUN set -e \
- && git -c advice.detachedHead=false clone https://github.com/creationix/nvm.git -b v0.33.11 --depth=1 "$NVM_DIR" \
- && . "$NVM_DIR/nvm.sh" \
- && nvm install v10.13.0
-
-ENV ANDROID_NDK_HOME=/android/sdk/ndk-bundle \
-    ANDROID_HOME=/android/sdk \
-    GRADLE_OPTS=-Dorg.gradle.daemon=false
\ No newline at end of file
diff --git a/platform/android/docker/android-ndk-r21b b/platform/android/docker/android-ndk-r21b
deleted file mode 100644
index 5226f1698..000000000
--- a/platform/android/docker/android-ndk-r21b
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM ghcr.io/maplibre/android-base
-
-WORKDIR /android/sdk
-
-# Install Android SDK
-# Use most recent version from https://developer.android.com/studio/index.html#command-tools
-# and update the checksum.
-RUN set -eu \
- && curl -L --retry 3 https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip -o tools.zip \
- && (echo "f10f9d5bca53cc27e2d210be2cbc7c0f1ee906ad9b868748d74d62e10f2c8275  tools.zip" | sha256sum -c) \
- && unzip -q tools.zip && rm tools.zip
-
-# Install Android NDK
-# Use desired version from https://developer.android.com/ndk/downloads/index.html
-# and update the checksum.
-RUN set -eu \
- && curl -L --retry 3 https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip -o ndk.zip \
- && (echo "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c  ndk.zip" | sha1sum -c) \
- && unzip -q ndk.zip && rm ndk.zip && mv android-ndk-r* ndk-bundle
-
-# Install dependencies and build tools
-
-RUN set -eu \
- && mkdir -p "${ANDROID_HOME}/licenses" \
- && echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "${ANDROID_HOME}/licenses/android-sdk-license" \
- && tools/bin/sdkmanager \
-        "--sdk_root=${ANDROID_HOME}" \ 
-        "platform-tools" \
-        "platforms;android-29" \
-        "build-tools;29.0.2" \
-        "build-tools;29.0.3" \
-        "platforms;android-28" \
-        "build-tools;28.0.3" \
-        "extras;android;m2repository" \
-        "patcher;v4" \
-        "extras;google;m2repository" \
-        "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" \
-        "cmake;3.10.2.4988404" \
- && rm -rf "${ANDROID_HOME}/licenses"
-
-WORKDIR /src
\ No newline at end of file
diff --git a/platform/android/docker/filesystem/apt-google-cloud-sdk.tar.gz b/platform/android/docker/filesystem/apt-google-cloud-sdk.tar.gz
deleted file mode 100644
index 7d4d9b821dfedca3f303e57e124c570ca730a2f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1837
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
b(H?h9rb{N^qRP&ccl=$+6yZWbPLPX~DUw=>

diff --git a/platform/android/docker/filesystem/apt-llvm.tar.gz b/platform/android/docker/filesystem/apt-llvm.tar.gz
deleted file mode 100644
index 4e2ddc05ee3b19b961ec9e6cacd73b7dda49777e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2915
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
Nxgwk>NPLZ(e*nyqjWz%P

diff --git a/platform/android/docker/filesystem/apt-toolchain.tar.gz b/platform/android/docker/filesystem/apt-toolchain.tar.gz
deleted file mode 100644
index 90eb302a37b584a5e6ad594b92fce83de4ded54e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 783
zcmV+q1MvJpT4*^jL0KkKS+J>9qW}R?|NsB{>-k>)|Nq|CjLZM`-^j=QA9o&l|JLPS
z{`q&}p8voB+}lur6;D$}m?nS#0002U13&{n4GjRq000dGKmY?qni?4zGy@@!^&UbM
zQR)UpgG~XZfXK)Jrhou6$)gYr02vt>226~AGy$Qb5YRC+#2RU!05k|RXlMbT(?A&w
z15Gq&VKf6KfY1QY#AMSZ0E|pP27#tSAi^{TjG6!d0#Zh%CQ5rsVt$lq=^m5R^)P^K
zKmalg02%?NfN1p%02u%c0MKc*Gynhq0B8krR#Ts-G@}3nX2d}UE7r*ELARJi35dIp
z*>0j(qIpPwQC=mxRY^6u`AtV<wNSnk5-6#5&Du2ch1!}0yJN<3_b!dd6O4zeO@3EI
zKzUKtAHhfYgezW<I2d{>uXvnuEj?zKU>=4d06;$Jf_{Vu!9s0><qf3NR$)PpP6~nQ
zypcHrlYlI!W<mlHb_nWwV0p9xZ(*QFfCK3O6O;k4+{qHXLfFE{TGqnZS1W7&!_C1%
zb5AO0Jy^1}!Jt4UP)xC!8o{KnEp%K!vr%&BEXe^?`R!uKpXErQgH(me-Nn1WG4+aH
zvpc_@x2Jchn8#wP@y@tb@|Ch$5zAyJ82o8zd?yz?xMZ4CBr?fXmU^2ASyA#K*DB%<
z9uC!qLeA?NZvo^xB9b`}j{+qDYtp~@U>YzFl?X{-``bQH#c2`rY<OTK+z%md3>Gq0
z=qWv|5(!DqrXWjE*XnP@bo-6n21d$x;nFIILWMYCA&e1-#TWx90RRKdjDi3a=>cUG
z@Ptd?J4p@2)i>MSl5xg`_2C-}7XtdGcKJtCp3?Kbp>rv=?E7~_>{n1iIg6A?Z4_N6
z9962A#PBvDG`79mVt7HS!AU=osk`9l|DRQh4Q~vlB+&7Qp|NGBmy-_Js2O9ZedG1D
zP(#1MiodFPy=hX6KHS3-aEem{pB*>$j%e5e863-C&k@svlP}$46vzModOaEz0>&}_
N7ji{7P>`^xRilrLS+)QG

diff --git a/platform/android/docker/filesystem/etc/apt/sources.list.d/google-cloud-sdk.list b/platform/android/docker/filesystem/etc/apt/sources.list.d/google-cloud-sdk.list
deleted file mode 100644
index 687dba5ed..000000000
--- a/platform/android/docker/filesystem/etc/apt/sources.list.d/google-cloud-sdk.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://packages.cloud.google.com/apt cloud-sdk-xenial main
diff --git a/platform/android/docker/filesystem/etc/apt/sources.list.d/llvm.list b/platform/android/docker/filesystem/etc/apt/sources.list.d/llvm.list
deleted file mode 100644
index 906c29eb1..000000000
--- a/platform/android/docker/filesystem/etc/apt/sources.list.d/llvm.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main
-deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main
diff --git a/platform/android/docker/filesystem/etc/apt/sources.list.d/toolchain.list b/platform/android/docker/filesystem/etc/apt/sources.list.d/toolchain.list
deleted file mode 100644
index 76d1868cc..000000000
--- a/platform/android/docker/filesystem/etc/apt/sources.list.d/toolchain.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main
-deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main 
diff --git a/platform/android/docker/filesystem/libsysconfcpus.tar.gz b/platform/android/docker/filesystem/libsysconfcpus.tar.gz
deleted file mode 100644
index bc066ff2cfb3624815e41ac1af4b95d06c182216..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3857
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
TQZRj2Klr<nDZ+$>iB9#P)bRWA

diff --git a/platform/android/docker/filesystem/tmp/google-cloud-sdk.gpg b/platform/android/docker/filesystem/tmp/google-cloud-sdk.gpg
deleted file mode 100644
index 37fc65d93a28237405daaa9d87dedf4c7073c87f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1326
zcmbQq$jcHc`)U&-2g9#fLK9^yzXxrYr(;zeJc;EEN8*|X{mT}%zDvJcl@=lU|EKDW
zj|FcsJR-f`+o*}{eHyl?Zp(b{>+Gf4i+{WAjxuLhl&;=u`~Sx01)NVV6|lY)<@a&-
ztvPRMHPJ(6YSMMz@68$0u3kw9V6dGgFzu}2rBdc=LT9GDbh=R<Y`5X7&4J}f>(B1k
ze|7R{v9(8a9~cS!c5!w-?WOt7-!s<Eu5y;zch@IMvkpm=tVnq>RktVBrc11AaU2_S
zZEwrMOSX$x{_AA@)yx04ySdfwXYbeGs(}187c4k?vtQ<Ax9flNaA#(j|2uP6`7B-I
z-R<E{YYX-~zWhl2jL?LfgYzB*1a5uKAjrtTxW&OeKR-PuRlzwYzcfW5ATc>RF+H_d
z!LhU?KR2-?Gg%=xGd(XeFI~YqwNk+*Jz2LTH8IyA9jr+&IX~B~lhKYvn30J=gOv#s
zuuRhWtemWiXEm^Kb8@gVGqH(sFmZBmvxqS<Gcw6BGKn`ZaB&KlyB*?KZdlD<u$_Zp
z#kLbSJPmj6IGbX&<@{@vDE(}6iQ9)+Z*90H@$$|$j`o;`U;aq(upX~j&#T&G*|+FG
ztZ`ECh0>YI0{bOzSDUIhTuff7`qpCi+5L-)+aoN5%kq7^dzUX%{xa)xu?f?`T+XK{
zr6!Ypmv4-X*i`j#nia>cKVA`=KCFHDUou)zWb+4$8z1iecg?D6ixw)H|2-wXcv3*x
z+}-9z&3vW%ycwNTC3O_O`Nb5iznnjDn(!*MY0>++Uu|Eohvkj#dGEhhL^_oPQkr&|
zai+=m&)KQALfi4jy2oCX788Q`k4S`dS03B+l4t+s!Y6Om3h3TnFx?~aI&bKi_UU@P
zjc!rPd!DhzH*8>HV4ev~mQe>YZUd9$Yw>t4&fSvJ`gnV|uT~y8$W>Jpc_2W2mQeft
zmhUI7f9-i5pmlZ~=RD2>Jwaa%yV%70E;xB|Tl+5d+u6O(S4m2nO{#d?`bKg64E^OT
z!q=C1rRer;nWm&>ce5$t(18b=*j2>K^H#Zix$)f5DWXbo<N1XJRr3FDU-==KbV`l=
zy~Wkit-4D7Nnz4TTjw7zzp(Ent3!Xu`o$@8LoQ64HKBcCw`p?3O5tot=4Tt^d)K;Y
zPl`<sy6f$dy>E^Bj$E}#Gp>EmIKnkixaE<{Blf+`c7C7bo1R^IWs(pWCf&8hpnH{&
zhUfoFz3~TUu<c(P#nZj0>FLHx+o!*i4O?DQWXWk9Xh{8J2?|)^l4TY%x8g4LFTX#&
zXa67Ceq(d}+~CC7Q!ZT%<CH#7r<iZ--H>&v=Og!xPKH@C6$7tNKVg&o@!jSl@v(Au
z<~H7GKCSGzDBek`@2l9Ux!)h{<X~I3M&Q_kZ9QVUjK6T5eQ~+sFHe)+?&VsiRj#fU
z>HF#?^=K<w+F7$QyVi|$|7QQR{<+`ld`AAd?LigqX8xPlp&Php?uI#EcV+C7H`>Lx
zoVng%3zs)%$-><RPuHX#s5ts~qiXl27q|OfESD9ww~tp8>FMsUiiq&Nt0;fa-oqg}
zw*2k;uZ|9S1!n6^x{V+GUfQbteXDhEv(lUk@B1?vTTH9k<Bohz)Hh$EDSN#o>uk*Y
T%Jq}_uDfP$*yvk+2$U=Ve7#Fb

diff --git a/platform/android/docker/filesystem/tmp/llvm.gpg b/platform/android/docker/filesystem/tmp/llvm.gpg
deleted file mode 100644
index 1af748690151038a1f3f58ee813f620f45422279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2236
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
K>c-^ll=d@v^A?Bz

diff --git a/platform/android/docker/filesystem/tmp/toolchain.gpg b/platform/android/docker/filesystem/tmp/toolchain.gpg
deleted file mode 100644
index 8771a79ac5c98acfbea1d026e80020ebf8df5384..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 355
zcmV-p0i6DrjRZ>IZ$|+H0LZv-HrnqQN@=PWjO}OCb^JuC<XhpyB3}KSBa$a8^UB7f
zv%J)!56;XaDfHVgs<7rZ;r04c(@hgV8q&P4YA&m4=UqK!PF=Tlm<MOuDY4{x-p&~W
zY(Hua8>LQNHAJnw`G<sv)e7j6q}ls(EVU&huS(6$+H7rjsMjnP`v4IE00FcbOks6y
zV`y+;WFS;;Z){^|VQFq4Vs&Y3WOInN1QP)Q03ZbdO5krt0viJc3ke7Z0|EpU0tf>H
z76JnS0v-VZ7k~f?2@oEWccQwU@_#Xk1O741N{s*{r3dLg4-rKksW2(8^N3i0mO{|W
zC}#R9v-3!8MVk9A&)G$WWznRR=da-{?G^bu;wM`?snd3qsiY~@$N*Q`ybU;<>C?|5
z0VmCb0YvvU9yzi@F{6z5iIWYQ%$h=zW&UsFHq(oR9=N}ja&Cvg*hQo>6*FJJ{}mZg
BoSFat

diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index e8a55cb41..d82f60d34 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -6,6 +6,12 @@ ext {
             compileSdkVersion: 33,
     ]
 
+    androidSdkVersions = [
+            buildToolsVersion: '31.0.0',
+            ndkVersion       : '25.1.8937393',
+            cmakeVersion     : '3.18.1+',
+    ]
+
     versions = [
             mapLibreServices: '5.9.0',
             mapboxCore      : '2.0.1',
diff --git a/platform/android/gradle/native-build.gradle b/platform/android/gradle/native-build.gradle
index 1c3414579..5c66f466f 100644
--- a/platform/android/gradle/native-build.gradle
+++ b/platform/android/gradle/native-build.gradle
@@ -1,5 +1,8 @@
 ext.nativeBuild = { nativeTargets ->
     android {
+        ndkVersion androidSdkVersions.ndkVersion
+        buildToolsVersion androidSdkVersions.buildToolsVersion
+
         defaultPublishConfig project.hasProperty("mapbox.buildtype") ? project.getProperty("mapbox.buildtype") : "debug"
 
         // We sometimes want to invoke Gradle without building a native dependency, e.g. when we just want
@@ -22,7 +25,7 @@ ext.nativeBuild = { nativeTargets ->
             externalNativeBuild {
                 cmake {
                     path "../MapboxGLAndroidSDK/src/cpp/CMakeLists.txt"
-                    version "3.10.2"
+                    version androidSdkVersions.cmakeVersion
                 }
             }
         }