mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 18:46:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gradle: update NDK and build tools versions to be consistent.

Browse source
This commit is contained in:
Ryan Pavlik 2022-01-20 17:49:11 -06:00
parent 4fb4d4d41c
commit 81eaf5c28c
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci/install-ndk.sh Normal file → Executable file
View file

@ -1,7 +1,9 @@
#!/bin/sh #!/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 # SPDX-License-Identifier: BSL-1.0
VERSION=r21
# aka 21.4.7075529
VERSION=r21e
FN=android-ndk-${VERSION}-linux-x86_64.zip FN=android-ndk-${VERSION}-linux-x86_64.zip
wget https://dl.google.com/android/repository/$FN wget https://dl.google.com/android/repository/$FN
unzip $FN -d /opt unzip $FN -d /opt

2
build.gradle
View file

@ -44,7 +44,7 @@ plugins {
} }
ext { ext {
ndk_version = '21.3.6528147' ndk_version = '21.4.7075529'
sharedTargetSdk = 30 sharedTargetSdk = 30
sharedMinSdk = 26 sharedMinSdk = 26

2
src/xrt/auxiliary/android/build.gradle
View file

@ -9,7 +9,7 @@ plugins {
android { android {
compileSdkVersion project.sharedTargetSdk compileSdkVersion project.sharedTargetSdk
buildToolsVersion '30.0.2' buildToolsVersion '30.0.3'
defaultConfig { defaultConfig {
minSdkVersion 24 minSdkVersion 24

2
src/xrt/targets/android_common/build.gradle
View file

@ -16,7 +16,7 @@ plugins {
android { android {
compileSdkVersion project.sharedTargetSdk compileSdkVersion project.sharedTargetSdk
buildToolsVersion '30.0.2' buildToolsVersion '30.0.3'
defaultConfig { defaultConfig {
minSdkVersion project.sharedMinSdk minSdkVersion project.sharedMinSdk