mirror of
https://github.com/jellyfin/jellyfin-androidx-media.git
synced 2024-11-23 06:09:45 +00:00
Update NDK to r26b (26.1.10909125) and set ABI & minSdk to 21
This commit is contained in:
parent
b6a9f68f6f
commit
72ff885656
2
.github/workflows/extension-build.yaml
vendored
2
.github/workflows/extension-build.yaml
vendored
@ -7,7 +7,7 @@ on:
|
||||
pull_request:
|
||||
|
||||
env:
|
||||
NDK_VER: 21.4.7075529
|
||||
NDK_VER: 26.1.10909125
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
2
.github/workflows/extension-publish.yaml
vendored
2
.github/workflows/extension-publish.yaml
vendored
@ -8,7 +8,7 @@ on:
|
||||
- master
|
||||
|
||||
env:
|
||||
NDK_VER: 21.4.7075529
|
||||
NDK_VER: 26.1.10909125
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
|
@ -23,10 +23,13 @@ allprojects {
|
||||
google()
|
||||
}
|
||||
|
||||
// Force specific NDK version
|
||||
// Set minSdk to 21 and force a specific NDK version
|
||||
afterEvaluate {
|
||||
val android = extensions.findByType(LibraryExtension::class.java)
|
||||
android?.ndkVersion = "21.4.7075529"
|
||||
if (android != null) {
|
||||
android.defaultConfig.minSdk = 21
|
||||
android.ndkVersion = "26.1.10909125"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
4
build.sh
4
build.sh
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Ensure NDK is available
|
||||
export ANDROID_NDK_PATH=$ANDROID_HOME/ndk/21.4.7075529
|
||||
export ANDROID_NDK_PATH=$ANDROID_HOME/ndk/26.1.10909125
|
||||
|
||||
[[ -z "$ANDROID_NDK_PATH" ]] && echo "No NDK found, quitting…" && exit 1
|
||||
|
||||
@ -16,4 +16,4 @@ ln -sf "${FFMPEG_PATH}" "${FFMPEG_MOD_PATH}/jni/ffmpeg"
|
||||
|
||||
# Start build
|
||||
cd "${FFMPEG_MOD_PATH}/jni"
|
||||
./build_ffmpeg.sh "${FFMPEG_MOD_PATH}" "${ANDROID_NDK_PATH}" "linux-x86_64" 16 "${ENABLED_DECODERS[@]}"
|
||||
./build_ffmpeg.sh "${FFMPEG_MOD_PATH}" "${ANDROID_NDK_PATH}" "linux-x86_64" 21 "${ENABLED_DECODERS[@]}"
|
||||
|
Loading…
Reference in New Issue
Block a user