From 994d7c2f552ef22768fe227a5fed357cdc296dd9 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Wed, 3 Mar 2021 21:31:27 +0000 Subject: [PATCH] fix setting build directory for lts releases in android.mk --- android.sh | 5 +++++ android/jni/Android.mk | 18 ++++++++++-------- android/jni/ffmpeg/Android.mk | 2 +- android/jni/ffmpeg/neon/Android.mk | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/android.sh b/android.sh index e4db576..787fd25 100755 --- a/android.sh +++ b/android.sh @@ -221,6 +221,7 @@ export API=${ORIGINAL_API} # SET ARCHITECTURES TO BUILD rm -f "${BASEDIR}"/android/build/.armv7 1>>"${BASEDIR}"/build.log 2>&1 rm -f "${BASEDIR}"/android/build/.armv7neon 1>>"${BASEDIR}"/build.log 2>&1 +rm -f "${BASEDIR}"/android/build/.lts 1>>"${BASEDIR}"/build.log 2>&1 ANDROID_ARCHITECTURES="" if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A]} -eq 1 ]] || [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A_NEON]} -eq 1 ]]; then ANDROID_ARCHITECTURES+="$(get_android_arch 0) " @@ -244,6 +245,10 @@ fi if [[ ${ENABLED_ARCHITECTURES[ARCH_X86_64]} -eq 1 ]]; then ANDROID_ARCHITECTURES+="$(get_android_arch 4) " fi +if [[ ! -z ${FFMPEG_KIT_LTS_BUILD} ]]; then + cat >"${BASEDIR}"/android/build/.lts <