From d024af8d00c313883a965010d739f762ef38141b Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Mon, 21 Nov 2022 14:17:22 -0300
Subject: [PATCH] ci: Use NDK 25b to build for the Android ABI level 33
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

25b is the currently supported NDK, as per the below:

https://github.com/android/ndk/wiki

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Sergi Blanch Torné <sergi.blanch.torne@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20019>
---
 .gitlab-ci/build/gitlab-ci.yml                    | 13 ++++++++++++-
 .gitlab-ci/container/create-android-cross-file.sh |  6 +++---
 .gitlab-ci/container/debian/android_build.sh      |  6 +++---
 .gitlab-ci/container/gitlab-ci.yml                |  4 ++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 81587d075bb..1218ba71304 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -323,6 +323,17 @@ debian-android:
       -Wno-error=initializer-overrides
       -Wno-error=missing-braces
       -Wno-error=sometimes-uninitialized
+      -Wno-error=unused-function
+      -Wno-error=implicit-const-int-float-conversion
+      -Wno-error=bitwise-instead-of-logical
+    CPP_ARGS: >
+      -Wno-error=deprecated-declarations
+      -Wno-error=non-virtual-dtor
+      -Wno-error=c99-designator
+      -Wno-error=unused-variable
+      -Wno-error=unused-but-set-variable
+      -Wno-error=self-assign
+      -Wno-error=bitwise-instead-of-logical
     DRI_LOADERS: >
       -D glx=disabled
       -D gbm=disabled
@@ -331,7 +342,7 @@ debian-android:
     EXTRA_OPTION: >
       -D android-stub=true
       -D llvm=disabled
-      -D platform-sdk-version=29
+      -D platform-sdk-version=33
       -D valgrind=disabled
       -D android-libbacktrace=false
     GALLIUM_ST: >
diff --git a/.gitlab-ci/container/create-android-cross-file.sh b/.gitlab-ci/container/create-android-cross-file.sh
index 98ab89ad64f..217ed3aa53c 100644
--- a/.gitlab-ci/container/create-android-cross-file.sh
+++ b/.gitlab-ci/container/create-android-cross-file.sh
@@ -16,12 +16,12 @@ arch2=${6:-$2}
 
 cat > "$cross_file" <<EOF
 [binaries]
-ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-ar'
+ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar'
 c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
-cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
+cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++']
 c_ld = 'lld'
 cpp_ld = 'lld'
-strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-strip'
+strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
 pkgconfig = ['/usr/bin/pkg-config']
 
 [host_machine]
diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh
index 88c7f1ff122..5aedf26dffb 100644
--- a/.gitlab-ci/container/debian/android_build.sh
+++ b/.gitlab-ci/container/debian/android_build.sh
@@ -14,7 +14,7 @@ apt-get install -y --no-remove $EPHEMERAL
 # Fetch the NDK and extract just the toolchain we want.
 ndk=$ANDROID_NDK
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o $ndk.zip https://dl.google.com/android/repository/$ndk-linux-x86_64.zip
+  -o $ndk.zip https://dl.google.com/android/repository/$ndk-linux.zip
 unzip -d / $ndk.zip "$ndk/toolchains/llvm/*"
 rm $ndk.zip
 # Since it was packed as a zip file, symlinks/hardlinks got turned into
@@ -90,11 +90,11 @@ for arch in \
        ccarch=armv7a-linux-androideabi
     fi
 
-    export CC=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch}-ar
+    export CC=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
     export CC=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/${ccarch}${ANDROID_SDK_VERSION}-clang
     export CXX=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/${ccarch}${ANDROID_SDK_VERSION}-clang++
     export LD=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch}-ld
-    export RANLIB=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch}-ranlib
+    export RANLIB=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
 
     # The configure script doesn't know about android, but doesn't really use the host anyway it
     # seems
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 21bbe6c699c..696b6a62bc8 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -174,8 +174,8 @@ debian/android_build:
     - .use-debian/x86_build-base
   variables:
     MESA_IMAGE_TAG: &debian-android_build ${DEBIAN_BUILD_TAG}
-    ANDROID_SDK_VERSION: 29
-    ANDROID_NDK: android-ndk-r21d
+    ANDROID_SDK_VERSION: 33
+    ANDROID_NDK: android-ndk-r25b
 
 .use-debian/android_build:
   extends: