Skip to content

ndk 21 #5126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lyqaiym wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ndk 21 #5126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions android/contrib/tools/do-compile-ffmpeg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fi


FF_BUILD_ROOT=`pwd`
FF_ANDROID_PLATFORM=android-9
FF_ANDROID_PLATFORM=android-21


FF_BUILD_NAME=
Expand Down Expand Up @@ -213,7 +213,7 @@ echo "--------------------"
echo "[*] check ffmpeg env"
echo "--------------------"
export PATH=$FF_TOOLCHAIN_PATH/bin/:$PATH
#export CC="ccache ${FF_CROSS_PREFIX}-gcc"
#export CC="ccache ${FF_CROSS_PREFIX}-clang"
export CC="${FF_CROSS_PREFIX}-gcc"
export LD=${FF_CROSS_PREFIX}-ld
export AR=${FF_CROSS_PREFIX}-ar
Expand Down Expand Up @@ -275,8 +275,9 @@ if [ "$FF_ARCH" = "x86" ]; then
FF_CFG_FLAGS="$FF_CFG_FLAGS --disable-asm"
else
# Optimization options (experts only):
FF_CFG_FLAGS="$FF_CFG_FLAGS --enable-asm"
FF_CFG_FLAGS="$FF_CFG_FLAGS --enable-inline-asm"
#FF_CFG_FLAGS="$FF_CFG_FLAGS --enable-asm"
#FF_CFG_FLAGS="$FF_CFG_FLAGS --enable-inline-asm"
FF_CFG_FLAGS="$FF_CFG_FLAGS --disable-asm"
fi

case "$FF_BUILD_OPT" in
Expand Down
2 changes: 1 addition & 1 deletion android/contrib/tools/do-detect-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*|13*|14*)
11*|12*|13*|14*|21*)
if test -d ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.9
then
echo "NDKr$IJK_NDK_REL detected"
Expand Down