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

update min sdk version in build.gradle when api level is explicitly set

Browse Source
This commit is contained in:
Taner Sener 2021-12-21 00:35:10 +00:00
parent 4b7b8dcfdd
commit 64a67922c7
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android.sh
View File

@ -155,6 +155,10 @@ if [[ -n ${DISPLAY_HELP} ]]; then
exit 0 exit 0
fi 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 "\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 -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 echo -e "$(date)\n" 1>>"${BASEDIR}"/build.log 2>&1

1
android/.gitignore vendored
View File

@ -5,3 +5,4 @@
/libs/ /libs/
/obj/ /obj/
/ffmpeg-kit-android-lib/build/ /ffmpeg-kit-android-lib/build/
*.tmp

4
scripts/function-android.sh
View File

@ -2,6 +2,8 @@
source "${BASEDIR}/scripts/function.sh" source "${BASEDIR}/scripts/function.sh"
prepare_inline_sed
enable_default_android_architectures() { enable_default_android_architectures() {
ENABLED_ARCHITECTURES[ARCH_ARM_V7A]=1 ENABLED_ARCHITECTURES[ARCH_ARM_V7A]=1
ENABLED_ARCHITECTURES[ARCH_ARM_V7A_NEON]=1 ENABLED_ARCHITECTURES[ARCH_ARM_V7A_NEON]=1
@ -1033,8 +1035,6 @@ set_toolchain_paths() {
if [ ! -f "${ZLIB_PACKAGE_CONFIG_PATH}" ]; then if [ ! -f "${ZLIB_PACKAGE_CONFIG_PATH}" ]; then
create_zlib_system_package_config 1>>"${BASEDIR}"/build.log 2>&1 create_zlib_system_package_config 1>>"${BASEDIR}"/build.log 2>&1
fi fi
prepare_inline_sed
} }
build_android_lts_support() { build_android_lts_support() {

4
scripts/function-ios.sh
View File

@ -2,6 +2,8 @@
source "${BASEDIR}/scripts/function-apple.sh" source "${BASEDIR}/scripts/function-apple.sh"
prepare_inline_sed
enable_default_ios_architectures() { enable_default_ios_architectures() {
ENABLED_ARCHITECTURES[ARCH_ARMV7]=1 ENABLED_ARCHITECTURES[ARCH_ARMV7]=1
ENABLED_ARCHITECTURES[ARCH_ARMV7S]=1 ENABLED_ARCHITECTURES[ARCH_ARMV7S]=1
@ -479,8 +481,6 @@ set_toolchain_paths() {
if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then
create_libuuid_system_package_config create_libuuid_system_package_config
fi fi
prepare_inline_sed
} }
initialize_prebuilt_ios_folders() { initialize_prebuilt_ios_folders() {

4
scripts/function-macos.sh
View File

@ -2,6 +2,8 @@
source "${BASEDIR}/scripts/function-apple.sh" source "${BASEDIR}/scripts/function-apple.sh"
prepare_inline_sed
enable_default_macos_architectures() { enable_default_macos_architectures() {
ENABLED_ARCHITECTURES[ARCH_ARM64]=1 ENABLED_ARCHITECTURES[ARCH_ARM64]=1
ENABLED_ARCHITECTURES[ARCH_X86_64]=1 ENABLED_ARCHITECTURES[ARCH_X86_64]=1
@ -375,8 +377,6 @@ set_toolchain_paths() {
if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then
create_libuuid_system_package_config create_libuuid_system_package_config
fi fi
prepare_inline_sed
} }
initialize_prebuilt_macos_folders() { initialize_prebuilt_macos_folders() {

4
scripts/function-tvos.sh
View File

@ -2,6 +2,8 @@
source "${BASEDIR}/scripts/function-apple.sh" source "${BASEDIR}/scripts/function-apple.sh"
prepare_inline_sed
enable_default_tvos_architectures() { enable_default_tvos_architectures() {
ENABLED_ARCHITECTURES[ARCH_ARM64]=1 ENABLED_ARCHITECTURES[ARCH_ARM64]=1
ENABLED_ARCHITECTURES[ARCH_X86_64]=1 ENABLED_ARCHITECTURES[ARCH_X86_64]=1
@ -426,8 +428,6 @@ set_toolchain_paths() {
if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then if [ ! -f "${LIB_UUID_PACKAGE_CONFIG_PATH}" ]; then
create_libuuid_system_package_config create_libuuid_system_package_config
fi fi
prepare_inline_sed
} }
initialize_prebuilt_tvos_folders() { initialize_prebuilt_tvos_folders() {