From 5c5c464988101fe3d801e1a6dd56beaac7ca4f6c Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 8 Jul 2025 17:13:20 +0200
Subject: [PATCH] ci/angle: Update gn arg to avoid warning message

After this change
https://chromium-review.googlesource.com/c/chromium/src/+/6547915,
using android32_ndk_api_level and android64_ndk_api_level gn args
will results in a warning message:

WARNING Build argument has no effect.
android32_ndk_api_level = 26
                          ^-
Did you mean "android_ndk_api_level"?

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35482>
---
 .gitlab-ci/conditional-build-image-tags.yml | 2 +-
 .gitlab-ci/container/build-angle.sh         | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
index e4c6f81cb71..544da507637 100644
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -1,6 +1,6 @@
 variables:
   CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7
-  CONDITIONAL_BUILD_ANGLE_TAG: f62910e55be46e37cc867d037e4a8121
+  CONDITIONAL_BUILD_ANGLE_TAG: cb6fbd691dd8721c62f0adbef0c97cf7
   CONDITIONAL_BUILD_CROSVM_TAG: 0f59350b1052bdbb28b65a832b494377
   CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9
   CONDITIONAL_BUILD_PIGLIT_TAG: 827b708ab7309721395ea28cec512968
diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
index 39cbf33211d..f2b9fb12871 100755
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -114,8 +114,7 @@ EOF
     ;;
   android) cat >> out/Release/args.gn <<EOF
 android_ndk_version="${ANDROID_NDK_VERSION}"
-android64_ndk_api_level=${ANDROID_SDK_VERSION}
-android32_ndk_api_level=${ANDROID_SDK_VERSION}
+android_ndk_api_level=${ANDROID_SDK_VERSION}
 use_custom_libcxx=true
 EOF
     ;;