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

ohmp · Dec 21, 2021 · 64a6792 · 64a6792
1 parent 4b7b8dc
commit 64a6792
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git 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
@@ -5,3 +5,4 @@
 /libs/
 /obj/
 /ffmpeg-kit-android-lib/build/
+*.tmp
diff --git 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
@@ -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
@@ -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
@@ -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() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ @@
     /libs/
     /obj/
     /ffmpeg-kit-android-lib/build/
+    *.tmp