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