diff --git a/android.sh b/android.sh index bf94df5..4f9e484 100755 --- a/android.sh +++ b/android.sh @@ -155,6 +155,10 @@ if [[ -n ${DISPLAY_HELP} ]]; then exit 0 fi +# SET API LEVEL IN build.gradle +${SED_INLINE} "s/minSdkVersion .*/minSdkVersion ${API}/g" "${BASEDIR}"/android/ffmpeg-kit-android-lib/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 +${SED_INLINE} "s/versionCode ..0/versionCode ${API}0/g" "${BASEDIR}"/android/ffmpeg-kit-android-lib/build.gradle 1>>"${BASEDIR}"/build.log 2>&1 + echo -e "\nBuilding ffmpeg-kit ${BUILD_TYPE_ID}library for Android\n" echo -e -n "INFO: Building ffmpeg-kit ${BUILD_VERSION} ${BUILD_TYPE_ID}library for Android: " 1>>"${BASEDIR}"/build.log 2>&1 echo -e "$(date)\n" 1>>"${BASEDIR}"/build.log 2>&1 diff --git a/android/.gitignore b/android/.gitignore index b10a5b5..d639a70 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -5,3 +5,4 @@ /libs/ /obj/ /ffmpeg-kit-android-lib/build/ +*.tmp diff --git a/scripts/function-android.sh b/scripts/function-android.sh index 4ed78b6..389a2c8 100755 --- a/scripts/function-android.sh +++ b/scripts/function-android.sh @@ -2,6 +2,8 @@ source "${BASEDIR}/scripts/function.sh" +prepare_inline_sed + enable_default_android_architectures() { ENABLED_ARCHITECTURES[ARCH_ARM_V7A]=1 ENABLED_ARCHITECTURES[ARCH_ARM_V7A_NEON]=1 @@ -1033,8 +1035,6 @@ set_toolchain_paths() { if [ ! -f "${ZLIB_PACKAGE_CONFIG_PATH}" ]; then create_zlib_system_package_config 1>>"${BASEDIR}"/build.log 2>&1 fi - - prepare_inline_sed } build_android_lts_support() { diff --git a/scripts/function-ios.sh b/scripts/function-ios.sh index a5284c2..f00de1a 100755 --- a/scripts/function-ios.sh +++ b/scripts/function-ios.sh @@ -2,6 +2,8 @@ source "${BASEDIR}/scripts/function-apple.sh" +prepare_inline_sed + enable_default_ios_architectures() { ENABLED_ARCHITECTURES[ARCH_ARMV7]=1 ENABLED_ARCHITECTURES[ARCH_ARMV7S]=1 @@ -479,8 +481,6 @@ set_toolchain_paths() { if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then create_libuuid_system_package_config fi - - prepare_inline_sed } initialize_prebuilt_ios_folders() { diff --git a/scripts/function-macos.sh b/scripts/function-macos.sh index 6762ee4..a746133 100755 --- a/scripts/function-macos.sh +++ b/scripts/function-macos.sh @@ -2,6 +2,8 @@ source "${BASEDIR}/scripts/function-apple.sh" +prepare_inline_sed + enable_default_macos_architectures() { ENABLED_ARCHITECTURES[ARCH_ARM64]=1 ENABLED_ARCHITECTURES[ARCH_X86_64]=1 @@ -375,8 +377,6 @@ set_toolchain_paths() { if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then create_libuuid_system_package_config fi - - prepare_inline_sed } initialize_prebuilt_macos_folders() { diff --git a/scripts/function-tvos.sh b/scripts/function-tvos.sh index f953e96..605336e 100755 --- a/scripts/function-tvos.sh +++ b/scripts/function-tvos.sh @@ -2,6 +2,8 @@ source "${BASEDIR}/scripts/function-apple.sh" +prepare_inline_sed + enable_default_tvos_architectures() { ENABLED_ARCHITECTURES[ARCH_ARM64]=1 ENABLED_ARCHITECTURES[ARCH_X86_64]=1 @@ -426,8 +428,6 @@ set_toolchain_paths() { if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then create_libuuid_system_package_config fi - - prepare_inline_sed } initialize_prebuilt_tvos_folders() {