diff --git a/android/contrib/tools/do-compile-ffmpeg.sh b/android/contrib/tools/do-compile-ffmpeg.sh index d67fb280754d84b848f3221fc6b0be971d54e650..ff1ae3dfecefec6aa0d58f03b96935841ba7fa40 100755 --- a/android/contrib/tools/do-compile-ffmpeg.sh +++ b/android/contrib/tools/do-compile-ffmpeg.sh @@ -194,7 +194,7 @@ esac mkdir -p $FF_PREFIX -mkdir -p $FF_SYSROOT +# mkdir -p $FF_SYSROOT FF_TOOLCHAIN_TOUCH="$FF_TOOLCHAIN_PATH/touch" diff --git a/android/contrib/tools/do-detect-env.sh b/android/contrib/tools/do-detect-env.sh index 93c38043e554240d61f63f3a76aaa5465539d66c..8c1d029fe6cfec74e495065686b60120856e629d 100644 --- a/android/contrib/tools/do-detect-env.sh +++ b/android/contrib/tools/do-detect-env.sh @@ -68,7 +68,7 @@ case "$IJK_NDK_REL" in IJK_NDK_REL=$(grep -o '^Pkg\.Revision.*=[0-9]*.*' $ANDROID_NDK/source.properties 2>/dev/null | sed 's/[[:space:]]*//g' | cut -d "=" -f 2) echo "IJK_NDK_REL=$IJK_NDK_REL" case "$IJK_NDK_REL" in - 11*|12*) + 11*|12*|13*) if test -d ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.9 then echo "NDKr$IJK_NDK_REL detected"