From 81eaf5c28c807182a7c589f48a0c9846f280cb62 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Thu, 20 Jan 2022 17:49:11 -0600
Subject: [PATCH] gradle: update NDK and build tools versions to be consistent.

---
 .gitlab-ci/install-ndk.sh                   | 6 ++++--
 build.gradle                                | 2 +-
 src/xrt/auxiliary/android/build.gradle      | 2 +-
 src/xrt/targets/android_common/build.gradle | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 .gitlab-ci/install-ndk.sh

diff --git a/.gitlab-ci/install-ndk.sh b/.gitlab-ci/install-ndk.sh
old mode 100644
new mode 100755
index 9735f6adb..0baf67ac0
--- a/.gitlab-ci/install-ndk.sh
+++ b/.gitlab-ci/install-ndk.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
-# Copyright 2018-2020, Collabora, Ltd. and the Monado contributors
+# Copyright 2018-2020, 2022, Collabora, Ltd. and the Monado contributors
 # SPDX-License-Identifier: BSL-1.0
-VERSION=r21
+
+# aka 21.4.7075529
+VERSION=r21e
 FN=android-ndk-${VERSION}-linux-x86_64.zip
 wget https://dl.google.com/android/repository/$FN
 unzip $FN -d /opt
diff --git a/build.gradle b/build.gradle
index 99f043386..db6d05fb2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ plugins {
 }
 
 ext {
-    ndk_version = '21.3.6528147'
+    ndk_version = '21.4.7075529'
     sharedTargetSdk = 30
     sharedMinSdk = 26
 
diff --git a/src/xrt/auxiliary/android/build.gradle b/src/xrt/auxiliary/android/build.gradle
index 14b2a2894..95512bebd 100644
--- a/src/xrt/auxiliary/android/build.gradle
+++ b/src/xrt/auxiliary/android/build.gradle
@@ -9,7 +9,7 @@ plugins {
 
 android {
     compileSdkVersion project.sharedTargetSdk
-    buildToolsVersion '30.0.2'
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         minSdkVersion 24
diff --git a/src/xrt/targets/android_common/build.gradle b/src/xrt/targets/android_common/build.gradle
index f48f54282..fe72fe61e 100644
--- a/src/xrt/targets/android_common/build.gradle
+++ b/src/xrt/targets/android_common/build.gradle
@@ -16,7 +16,7 @@ plugins {
 
 android {
     compileSdkVersion project.sharedTargetSdk
-    buildToolsVersion '30.0.2'
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         minSdkVersion project.sharedMinSdk