fix application.mk paths

development
Taner Sener 7 months ago
parent b476453c5f
commit a68a8c47a4
  1. 1
      .gitignore
  2. 16
      android.sh
  3. 30
      android/jni/Android.mk
  4. 6
      android/jni/ffmpeg/Android.mk
  5. 6
      android/jni/ffmpeg/neon/Android.mk
  6. 12
      scripts/function.sh

1
.gitignore vendored

@ -3,3 +3,4 @@
/prebuilt/ /prebuilt/
.DS_Store .DS_Store
.idea .idea
/android/jni/build.mk

@ -270,20 +270,22 @@ done
export API=${ORIGINAL_API} export API=${ORIGINAL_API}
# SET ARCHITECTURES TO BUILD # SET ARCHITECTURES TO BUILD
rm -f "${BASEDIR}"/android/build/.armv7 1>>"${BASEDIR}"/build.log 2>&1 create_file "${BASEDIR}"/android/jni/build.mk "API := ${API}"
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) "
fi fi
if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A]} -eq 1 ]]; then if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A]} -eq 1 ]]; then
mkdir -p "${BASEDIR}"/android/build 1>>"${BASEDIR}"/build.log 2>&1 mkdir -p "${BASEDIR}"/android/build 1>>"${BASEDIR}"/build.log 2>&1
create_file "${BASEDIR}"/android/build/.armv7 append_file "${BASEDIR}"/android/jni/build.mk "ARMV7 := true"
else
append_file "${BASEDIR}"/android/jni/build.mk "ARMV7 := false"
fi fi
if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A_NEON]} -eq 1 ]]; then if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM_V7A_NEON]} -eq 1 ]]; then
mkdir -p "${BASEDIR}"/android/build 1>>"${BASEDIR}"/build.log 2>&1 mkdir -p "${BASEDIR}"/android/build 1>>"${BASEDIR}"/build.log 2>&1
create_file "${BASEDIR}"/android/build/.armv7neon append_file "${BASEDIR}"/android/jni/build.mk "ARMV7_NEON := true"
else
append_file "${BASEDIR}"/android/jni/build.mk "ARMV7_NEON := false"
fi fi
if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM64_V8A]} -eq 1 ]]; then if [[ ${ENABLED_ARCHITECTURES[ARCH_ARM64_V8A]} -eq 1 ]]; then
ANDROID_ARCHITECTURES+="$(get_android_arch 2) " ANDROID_ARCHITECTURES+="$(get_android_arch 2) "
@ -296,7 +298,9 @@ if [[ ${ENABLED_ARCHITECTURES[ARCH_X86_64]} -eq 1 ]]; then
fi fi
if [[ ! -z ${FFMPEG_KIT_LTS_BUILD} ]]; then if [[ ! -z ${FFMPEG_KIT_LTS_BUILD} ]]; then
mkdir -p "${BASEDIR}"/android/build 1>>"${BASEDIR}"/build.log 2>&1 mkdir -p "${BASEDIR}"/android/build 1>>"${BASEDIR}"/build.log 2>&1
create_file "${BASEDIR}"/android/build/.lts append_file "${BASEDIR}"/android/jni/build.mk "LTS_POSTFIX := -lts"
else
append_file "${BASEDIR}"/android/jni/build.mk "LTS_POSTFIX := "
fi fi
# BUILD FFMPEG-KIT # BUILD FFMPEG-KIT

@ -1,31 +1,23 @@
MY_LOCAL_PATH := $(call my-dir) MY_LOCAL_PATH := $(call my-dir)
$(call import-add-path, $(MY_LOCAL_PATH)) $(call import-add-path, $(MY_LOCAL_PATH))
include $(MY_LOCAL_PATH)/build.mk
MY_ARMV7 := false MY_ARMV7 := false
MY_ARMV7_NEON := false MY_ARMV7_NEON := false
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
ifeq ("$(shell test -e $(MY_LOCAL_PATH)/../build/.armv7 && echo armv7)","armv7") MY_ARMV7 := ${ARMV7}
MY_ARMV7 := true MY_ARMV7_NEON := ${ARMV7_NEON}
endif
ifeq ("$(shell test -e $(MY_LOCAL_PATH)/../build/.armv7neon && echo armv7neon)","armv7neon")
MY_ARMV7_NEON := true
endif
endif
ifeq ("$(shell test -e $(MY_LOCAL_PATH)/../build/.lts && echo lts)","lts")
MY_LTS_POSTFIX := -lts
else
MY_LTS_POSTFIX :=
endif endif
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
ifeq ($(MY_ARMV7_NEON), true) ifeq ($(MY_ARMV7_NEON), true)
MY_BUILD_DIR := android-$(TARGET_ARCH)-neon$(MY_LTS_POSTFIX) MY_BUILD_DIR := android-$(TARGET_ARCH)-neon-$(API)$(LTS_POSTFIX)
else else
MY_BUILD_DIR := android-$(TARGET_ARCH)$(MY_LTS_POSTFIX) MY_BUILD_DIR := android-$(TARGET_ARCH)-$(API)$(LTS_POSTFIX)
endif endif
else else
MY_BUILD_DIR := android-$(TARGET_ARCH)$(MY_LTS_POSTFIX) MY_BUILD_DIR := android-$(TARGET_ARCH)-$(API)$(LTS_POSTFIX)
endif endif
FFMPEG_INCLUDES := $(MY_LOCAL_PATH)/../../prebuilt/$(MY_BUILD_DIR)/ffmpeg/include FFMPEG_INCLUDES := $(MY_LOCAL_PATH)/../../prebuilt/$(MY_BUILD_DIR)/ffmpeg/include
@ -37,11 +29,7 @@ LOCAL_PATH := $(MY_LOCAL_PATH)/../ffmpeg-kit-android-lib/src/main/cpp
# DEFINE ARCH FLAGS # DEFINE ARCH FLAGS
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a) ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
MY_ARCH_FLAGS := ARM_V7A MY_ARCH_FLAGS := ARM_V7A
ifeq ("$(shell test -e $(MY_LOCAL_PATH)/../build/.lts && echo lts)","lts") MY_ARM_NEON := false
MY_ARM_NEON := false
else
MY_ARM_NEON := true
endif
endif endif
ifeq ($(TARGET_ARCH_ABI), arm64-v8a) ifeq ($(TARGET_ARCH_ABI), arm64-v8a)
MY_ARCH_FLAGS := ARM64_V8A MY_ARCH_FLAGS := ARM64_V8A
@ -69,7 +57,7 @@ include $(BUILD_SHARED_LIBRARY)
$(call import-module, cpu-features) $(call import-module, cpu-features)
MY_SRC_FILES := ffmpegkit.c ffprobekit.c ffmpegkit_exception.c fftools_cmdutils.c fftools_ffmpeg.c fftools_ffprobe.c fftools_ffmpeg_mux.c fftools_ffmpeg_mux_init.c fftools_ffmpeg_demux.c fftools_ffmpeg_opt.c fftools_opt_common.c fftools_ffmpeg_hw.c fftools_ffmpeg_filter.c fftools_objpool.c fftools_sync_queue.c fftools_thread_queue.c android_support.c MY_SRC_FILES := ffmpegkit.c ffprobekit.c ffmpegkit_exception.c fftools_cmdutils.c fftools_ffmpeg.c fftools_ffprobe.c fftools_ffmpeg_mux.c fftools_ffmpeg_mux_init.c fftools_ffmpeg_demux.c fftools_ffmpeg_enc.c fftools_ffmpeg_opt.c fftools_opt_common.c fftools_ffmpeg_hw.c fftools_ffmpeg_filter.c fftools_objpool.c fftools_sync_queue.c fftools_thread_queue.c android_support.c
MY_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-switch -Wno-sign-compare MY_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-switch -Wno-sign-compare
MY_LDLIBS := -llog -lz -landroid MY_LDLIBS := -llog -lz -landroid

@ -1,8 +1,4 @@
ifeq ($(MY_LTS_POSTFIX),-lts) LOCAL_PATH := $(call my-dir)/../../../prebuilt/$(MY_BUILD_DIR)/ffmpeg/lib
LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)-lts/ffmpeg/lib
else
LOCAL_PATH := $(call my-dir)/../../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/lib
endif
MY_ARM_MODE := arm MY_ARM_MODE := arm

@ -1,8 +1,4 @@
ifeq ($(MY_LTS_POSTFIX),-lts) LOCAL_PATH := $(call my-dir)/../../../../prebuilt/$(MY_BUILD_DIR)/ffmpeg/lib
LOCAL_PATH := $(call my-dir)/../../../../prebuilt/android-$(TARGET_ARCH)-neon-lts/ffmpeg/lib
else
LOCAL_PATH := $(call my-dir)/../../../../prebuilt/android-$(TARGET_ARCH)-neon/ffmpeg/lib
endif
MY_ARM_MODE := arm MY_ARM_MODE := arm
MY_ARM_NEON := true MY_ARM_NEON := true

@ -2350,10 +2350,18 @@ overwrite_file() {
# #
# 1. destination file # 1. destination file
# 2. initial content
# #
create_file() { create_file() {
rm -f "$1" echo "$2" > "$1" 2>>"${BASEDIR}"/build.log 2>&1
echo "" > "$1" 1>>"${BASEDIR}"/build.log 2>&1 }
#
# 1. destination file
# 2. content to append
#
append_file() {
echo "$2" >> "$1" 2>>"${BASEDIR}"/build.log 2>&1
} }
compare_versions() { compare_versions() {

Loading…
Cancel
Save