From 1dd56f1a90ecac302e99750ae6daf260360a75ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Sun, 25 Aug 2024 17:38:27 +0200 Subject: [PATCH] Remove unnecessary `ndkVersion` from Gradle build Gradle can determine the NDK version automatically and this property is only required if multiple NDK versions are installed. The NDK version previously determined from the filename could not be parsed by Gradle anyway. --- scripts/android/cmake_android.sh | 2 -- scripts/android/files/build.gradle | 1 - scripts/android/files/build.sh | 1 - 3 files changed, 4 deletions(-) diff --git a/scripts/android/cmake_android.sh b/scripts/android/cmake_android.sh index b2468227f..2ceeecb47 100755 --- a/scripts/android/cmake_android.sh +++ b/scripts/android/cmake_android.sh @@ -7,8 +7,6 @@ export MAKEFLAGS ANDROID_NDK_VERSION="$(cd "$ANDROID_HOME/ndk" && find . -maxdepth 1 | sort -n | tail -1)" ANDROID_NDK_VERSION="${ANDROID_NDK_VERSION:2}" -# ANDROID_NDK_VERSION must be exported for build.sh step -export ANDROID_NDK_VERSION # ANDROID_NDK_HOME must be exported for cargo-ndk export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$ANDROID_NDK_VERSION" diff --git a/scripts/android/files/build.gradle b/scripts/android/files/build.gradle index 31bb06bb6..e0090e7d0 100644 --- a/scripts/android/files/build.gradle +++ b/scripts/android/files/build.gradle @@ -18,7 +18,6 @@ java { android { compileSdkVersion 34 - ndkVersion "TW_NDK_VERSION" defaultConfig { applicationId "org.ddnet.client" namespace("org.ddnet.client") diff --git a/scripts/android/files/build.sh b/scripts/android/files/build.sh index a52d3c3a5..7958e7f67 100644 --- a/scripts/android/files/build.sh +++ b/scripts/android/files/build.sh @@ -45,7 +45,6 @@ sed -i "s/TW_KEY_NAME/${TW_KEY_NAME_ESCAPED}/g" build.gradle sed -i "s/TW_KEY_PW/${TW_KEY_PW_ESCAPED}/g" build.gradle sed -i "s/TW_KEY_ALIAS/${TW_KEY_ALIAS_ESCAPED}/g" build.gradle -sed -i "s/TW_NDK_VERSION/${ANDROID_NDK_VERSION}/g" build.gradle sed -i "s/TW_VERSION_CODE/${TW_VERSION_CODE}/g" build.gradle sed -i "s/TW_VERSION_NAME/${TW_VERSION_NAME}/g" build.gradle