Bitmessage/PyBitmessage-2024-12-09
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Set NDK as recommended by buildozer, update also SDK tools versions

Browse Source
This commit is contained in:
Lee Miller 2024-01-27 01:08:47 +02:00
parent c45f1eae14
commit f6538a3473
Signed by untrusted user: lee.miller
GPG Key ID: 4F97A5EA88F4AB63
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.buildbot/android/Dockerfile
View File

@ -18,7 +18,7 @@ RUN apt -y update -qq \
ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" 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}" 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 # 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" ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
# get the latest version from https://developer.android.com/studio/index.html # get the latest version from https://developer.android.com/studio/index.html
ENV ANDROID_SDK_TOOLS_VERSION="8092744" ENV ANDROID_SDK_TOOLS_VERSION="11076708"
ENV ANDROID_SDK_BUILD_TOOLS_VERSION="30.0.3" 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_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_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}" ENV ANDROID_SDK_MANAGER="${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME}"

2
packages/android/buildozer.spec
View File

@ -98,7 +98,7 @@ android.api = 28
android.minapi = 21 android.minapi = 21
# (str) Android NDK version to use # (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. # (int) Android NDK API to use (optional). This is the minimum API your app will support.
android.ndk_api = 21 android.ndk_api = 21