From 5f8477cd59820e7ddc8c00eff8c85a29b0a8a8e0 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Sat, 8 Oct 2016 11:41:22 +0800 Subject: [PATCH] android/build: make NDKr13 happy --- android/contrib/tools/do-compile-ffmpeg.sh | 2 +- android/contrib/tools/do-detect-env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/contrib/tools/do-compile-ffmpeg.sh b/android/contrib/tools/do-compile-ffmpeg.sh index d67fb280..ff1ae3df 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 93c38043..8c1d029f 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" -- GitLab