diff --git a/.github/workflows/build all libs.yml b/.github/workflows/build all libs.yml index ef0b9a73..9adaf2ec 100644 --- a/.github/workflows/build all libs.yml +++ b/.github/workflows/build all libs.yml @@ -92,8 +92,9 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r27c + ndk-version: r21e add-to-path: true + link-to-sdk: true local-cache: false - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/build custom libs.yml b/.github/workflows/build custom libs.yml index 367d0ef9..ef2cf9c9 100644 --- a/.github/workflows/build custom libs.yml +++ b/.github/workflows/build custom libs.yml @@ -60,8 +60,9 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r27c + ndk-version: r21e add-to-path: true + link-to-sdk: true local-cache: false - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/build one lib.yml b/.github/workflows/build one lib.yml index 336ff168..66ca3cc3 100644 --- a/.github/workflows/build one lib.yml +++ b/.github/workflows/build one lib.yml @@ -95,8 +95,9 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r27c + ndk-version: r21e add-to-path: true + link-to-sdk: true local-cache: false - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/onestep.sh b/.github/workflows/onestep.sh index 9d5ee0c2..e34a4ebd 100755 --- a/.github/workflows/onestep.sh +++ b/.github/workflows/onestep.sh @@ -24,7 +24,7 @@ fi export HOMEBREW_NO_AUTO_UPDATE=1 export RELEASE_DATE=$(TZ=UTC-8 date +'%y%m%d%H%M%S') -export RELEASE_VERSION=$(grep GIT_REPO_VERSION= ./configs/libs/${LIB_NAME}.sh | tail -n 1 | awk -F = '{printf "%s",$2}') +export RELEASE_VERSION="$(grep GIT_REPO_VERSION= ./configs/libs/${LIB_NAME}.sh | tail -n 1 | awk -F = '{printf "%s",$2}')-19" export TAG=${LIB_NAME}-${RELEASE_VERSION}-${RELEASE_DATE} export TITLE="👏👏${LIB_NAME}-${PLAT}-${RELEASE_VERSION}" diff --git a/configs/libs/ijkffmpeg.sh b/configs/libs/ijkffmpeg.sh index d1a3e258..5c13f850 100644 --- a/configs/libs/ijkffmpeg.sh +++ b/configs/libs/ijkffmpeg.sh @@ -40,7 +40,7 @@ else fi # pre compiled -export PRE_COMPILE_TAG_ANDROID=ijkffmpeg-4.0-260402143959 +export PRE_COMPILE_TAG_ANDROID=ijkffmpeg-4.0-19-260624223626 export PRE_COMPILE_TAG_TVOS=ijkffmpeg-4.0-260228145716 export PRE_COMPILE_TAG_MACOS=ijkffmpeg-4.0-260228145716 export PRE_COMPILE_TAG_IOS=ijkffmpeg-4.0-260402145042 diff --git a/configs/libs/openssl.sh b/configs/libs/openssl.sh index 2cc8d26d..4c5a1ade 100644 --- a/configs/libs/openssl.sh +++ b/configs/libs/openssl.sh @@ -33,4 +33,4 @@ fi export PRE_COMPILE_TAG_TVOS=openssl-1.1.1w-250318092610 export PRE_COMPILE_TAG_MACOS=openssl-1.1.1w-250318092610 export PRE_COMPILE_TAG_IOS=openssl-1.1.1w-250318092610 -export PRE_COMPILE_TAG_ANDROID=openssl-1.1.1w-250310112430 +export PRE_COMPILE_TAG_ANDROID=openssl-1.1.1w-19-260522231401 diff --git a/configs/libs/soundtouch.sh b/configs/libs/soundtouch.sh index 4d1c519f..10f77773 100644 --- a/configs/libs/soundtouch.sh +++ b/configs/libs/soundtouch.sh @@ -43,4 +43,4 @@ fi export PRE_COMPILE_TAG_TVOS=soundtouch-2.4.0-260228135702 export PRE_COMPILE_TAG_MACOS=soundtouch-2.4.0-260228135702 export PRE_COMPILE_TAG_IOS=soundtouch-2.4.0-260228135702 -export PRE_COMPILE_TAG_ANDROID=soundtouch-2.4.0-260228135702 +export PRE_COMPILE_TAG_ANDROID=soundtouch-2.4.0-19-260523151119 diff --git a/configs/libs/yuv.sh b/configs/libs/yuv.sh index c324a7e3..fca56f93 100644 --- a/configs/libs/yuv.sh +++ b/configs/libs/yuv.sh @@ -48,4 +48,4 @@ fi export PRE_COMPILE_TAG_TVOS=yuv-main-f94b8cf7-260228135452 export PRE_COMPILE_TAG_MACOS=yuv-main-f94b8cf7-260228135452 export PRE_COMPILE_TAG_IOS=yuv-main-f94b8cf7-260228135452 -export PRE_COMPILE_TAG_ANDROID=yuv-main-f94b8cf7-260228135452 \ No newline at end of file +export PRE_COMPILE_TAG_ANDROID=yuv-main-f94b8cf7-19-260522232202 \ No newline at end of file diff --git a/do-compile/android/openssl.sh b/do-compile/android/openssl.sh index cdab62ed..7602bc6a 100755 --- a/do-compile/android/openssl.sh +++ b/do-compile/android/openssl.sh @@ -50,7 +50,7 @@ case $_MR_ARCH in ;; esac -CFG_FLAGS="no-shared no-engine no-apps no-dynamic-engine no-static-engine \ +CFG_FLAGS="no-shared no-engine no-dynamic-engine no-static-engine \ no-dso no-ui-console no-tests \ --prefix=$MR_BUILD_PREFIX \ --openssldir=$MR_BUILD_PREFIX \ diff --git a/tools/export-android-build-env.sh b/tools/export-android-build-env.sh index f9a667fc..ede475ae 100755 --- a/tools/export-android-build-env.sh +++ b/tools/export-android-build-env.sh @@ -18,7 +18,7 @@ # https://developer.android.com/ndk/guides/abis?hl=zh-cn#cmake_1 -export MR_ANDROID_API=21 +export MR_ANDROID_API=19 case $_MR_ARCH in *v7a)