antonlyap/ffmpeg-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix setting build directory for lts releases in android.mk

Browse Source
This commit is contained in:
Taner Sener 2021-03-03 21:31:27 +00:00
parent 2cf5f9ff0e
commit 994d7c2f55
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android.sh
View File

@ -221,6 +221,7 @@ export API=${ORIGINAL_API}
# SET ARCHITECTURES TO BUILD # SET ARCHITECTURES TO BUILD
rm -f "${BASEDIR}"/android/build/.armv7 1>>"${BASEDIR}"/build.log 2>&1 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/.armv7neon 1>>"${BASEDIR}"/build.log 2>&1
rm -f "${BASEDIR}"/android/build/.lts 1>>"${BASEDIR}"/build.log 2>&1
ANDROID_ARCHITECTURES="" ANDROID_ARCHITECTURES=""
if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A]} -eq 1 ]] || [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A_NEON]} -eq 1 ]]; then if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A]} -eq 1 ]] || [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A_NEON]} -eq 1 ]]; then
ANDROID_ARCHITECTURES+="$(get_android_arch 0) " ANDROID_ARCHITECTURES+="$(get_android_arch 0) "
@ -244,6 +245,10 @@ fi
if [[ ${ENABLED_ARCHITECTURES[ARCH_X86_64]} -eq 1 ]]; then if [[ ${ENABLED_ARCHITECTURES[ARCH_X86_64]} -eq 1 ]]; then
ANDROID_ARCHITECTURES+="$(get_android_arch 4) " ANDROID_ARCHITECTURES+="$(get_android_arch 4) "
fi fi
if [[ ! -z ${FFMPEG_KIT_LTS_BUILD} ]]; then
cat >"${BASEDIR}"/android/build/.lts <<EOF
EOF
fi
# BUILD FFMPEG-KIT # BUILD FFMPEG-KIT
if [[ -n ${ANDROID_ARCHITECTURES} ]]; then if [[ -n ${ANDROID_ARCHITECTURES} ]]; then

18
android/jni/Android.mk
View File

@ -12,18 +12,20 @@ ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
endif endif
endif endif
ifeq ($(TARGET_PLATFORM),android-16) ifeq ("$(shell test -e $(MY_LOCAL_PATH)/../build/.lts && echo lts)","lts")
MY_LTS_POSTFIX := -lts
else
MY_LTS_POSTFIX :=
endif
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
ifeq ($(MY_ARMV7_NEON), true) ifeq ($(MY_ARMV7_NEON), true)
MY_BUILD_DIR := android-$(TARGET_ARCH)-neon-lts MY_BUILD_DIR := android-$(TARGET_ARCH)-neon$(MY_LTS_POSTFIX)
else else
MY_BUILD_DIR := android-$(TARGET_ARCH)-lts MY_BUILD_DIR := android-$(TARGET_ARCH)$(MY_LTS_POSTFIX)
endif endif
else else
ifeq ($(MY_ARMV7_NEON), true) MY_BUILD_DIR := android-$(TARGET_ARCH)$(MY_LTS_POSTFIX)
MY_BUILD_DIR := android-$(TARGET_ARCH)-neon
else
MY_BUILD_DIR := android-$(TARGET_ARCH)
endif
endif endif
FFMPEG_INCLUDES := $(MY_LOCAL_PATH)/../../prebuilt/$(MY_BUILD_DIR)/ffmpeg/include FFMPEG_INCLUDES := $(MY_LOCAL_PATH)/../../prebuilt/$(MY_BUILD_DIR)/ffmpeg/include

2
android/jni/ffmpeg/Android.mk
View File

@ -1,4 +1,4 @@
ifeq ($(TARGET_PLATFORM),android-16) ifeq ($(MY_LTS_POSTFIX),-lts)
LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)-lts/ffmpeg/lib LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)-lts/ffmpeg/lib
else else
LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/lib LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/lib

2
android/jni/ffmpeg/neon/Android.mk
View File

@ -1,4 +1,4 @@
ifeq ($(TARGET_PLATFORM),android-16) ifeq ($(MY_LTS_POSTFIX),-lts)
LOCAL_PATH := $(call my-dir)/../../../../prebuilt/android-$(TARGET_ARCH)-neon-lts/ffmpeg/lib LOCAL_PATH := $(call my-dir)/../../../../prebuilt/android-$(TARGET_ARCH)-neon-lts/ffmpeg/lib
else else
LOCAL_PATH := $(call my-dir)/../../../../prebuilt/android-$(TARGET_ARCH)-neon/ffmpeg/lib LOCAL_PATH := $(call my-dir)/../../../../prebuilt/android-$(TARGET_ARCH)-neon/ffmpeg/lib