From f6538a3473bb91a8905d10cb0b0502d16acc5cba Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Sat, 27 Jan 2024 01:08:47 +0200 Subject: [PATCH] Set NDK as recommended by buildozer, update also SDK tools versions --- .buildbot/android/Dockerfile | 6 +++--- packages/android/buildozer.spec | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.buildbot/android/Dockerfile b/.buildbot/android/Dockerfile index 83ea3b66..11953fc0 100755 --- a/.buildbot/android/Dockerfile +++ b/.buildbot/android/Dockerfile @@ -18,7 +18,7 @@ RUN apt -y update -qq \ ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" -ENV ANDROID_NDK_VERSION="23b" +ENV ANDROID_NDK_VERSION="25b" ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}" # get the latest version from https://developer.android.com/ndk/downloads/index.html @@ -35,8 +35,8 @@ RUN curl "${ANDROID_NDK_DL_URL}" \ ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk" # get the latest version from https://developer.android.com/studio/index.html -ENV ANDROID_SDK_TOOLS_VERSION="8092744" -ENV ANDROID_SDK_BUILD_TOOLS_VERSION="30.0.3" +ENV ANDROID_SDK_TOOLS_VERSION="11076708" +ENV ANDROID_SDK_BUILD_TOOLS_VERSION="34.0.0" ENV ANDROID_SDK_TOOLS_ARCHIVE="commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip" ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}" ENV ANDROID_SDK_MANAGER="${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME}" diff --git a/packages/android/buildozer.spec b/packages/android/buildozer.spec index 5e4ad2b3..1cd7478a 100644 --- a/packages/android/buildozer.spec +++ b/packages/android/buildozer.spec @@ -98,7 +98,7 @@ android.api = 28 android.minapi = 21 # (str) Android NDK version to use -android.ndk = 23b +android.ndk = 25b # (int) Android NDK API to use (optional). This is the minimum API your app will support. android.ndk_api = 21 @@ -354,4 +354,4 @@ warn_on_root = 1 # # Then, invoke the command line with the "demo" profile: # -#buildozer --profile demo android debug \ No newline at end of file +#buildozer --profile demo android debug