Merge pull request ddnet#8837 from Robyt3/Android-Build-NDK-Version-Fix

Remove unnecessary `ndkVersion` from Gradle build
Robyt3 · Aug 28, 2024 · cc1dc40 · cc1dc40
2 parents 5a66dc0 + 1dd56f1
commit cc1dc40
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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