aboutsummaryrefslogtreecommitdiffstats
path: root/android/config-armv7-a-neon.mak
diff options
context:
space:
mode:
Diffstat (limited to 'android/config-armv7-a-neon.mak')
-rw-r--r--android/config-armv7-a-neon.mak13
1 files changed, 8 insertions, 5 deletions
diff --git a/android/config-armv7-a-neon.mak b/android/config-armv7-a-neon.mak
index 2e458b3fb7..21639093c5 100644
--- a/android/config-armv7-a-neon.mak
+++ b/android/config-armv7-a-neon.mak
@@ -1,7 +1,7 @@
# Automatically generated by configure - do not modify!
ifndef FFMPEG_CONFIG_MAK
FFMPEG_CONFIG_MAK=1
-FFMPEG_CONFIGURATION=--arch=arm --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-doc --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug
+FFMPEG_CONFIGURATION=--arch=arm --cpu=armv7-a --build_suffix= --cross-prefix=../../prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi- --enable-cross-compile --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm --target-os=linux --disable-static --enable-shared --enable-optimizations --disable-symver --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-avdevice --disable-devices --disable-filters --disable-demuxer=srt --disable-demuxer=microdvd --disable-demuxer=jacosub --disable-demuxer=sami --disable-demuxer=realtext --disable-demuxer=dts --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=pjs --disable-demuxer=vplayer --disable-demuxer=mpl2 --disable-decoder=ass --disable-decoder=srt --disable-decoder=subrip --disable-decoder=microdvd --disable-decoder=jacosub --disable-decoder=sami --disable-decoder=realtext --disable-decoder=movtext --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=pjs --disable-decoder=vplayer --disable-decoder=mpl2 --enable-zlib --enable-pic --disable-debug --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages
prefix=/usr/local
LIBDIR=$(DESTDIR)${prefix}/lib
SHLIBDIR=$(DESTDIR)${prefix}/lib
@@ -40,7 +40,7 @@ LN_S=ln -s -f
CPPFLAGS= --sysroot=../../prebuilts/ndk/current/platforms/android-21/arch-arm -isysroot ../../prebuilts/ndk/current/platforms/android-21/arch-arm -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Dstrtod=avpriv_strtod -DPIC -DZLIB_CONST
CFLAGS= -march=armv7-a -std=c99 -fomit-frame-pointer -fPIC -marm -pthread -Wdeclaration-after-statement -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla -Wformat -fdiagnostics-color=auto -Wno-maybe-uninitialized
CXXFLAGS= -D__STDC_CONSTANT_MACROS
-OBJCFLAGS=
+OBJCFLAGS=
ASFLAGS= -march=armv7-a -fPIC
AS_C=-c
AS_O=-o $@
@@ -97,7 +97,7 @@ HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@
HOSTCC_C=-c
HOSTCC_O=-o $@
HOSTLD_O=-o $@
-TARGET_EXEC=
+TARGET_EXEC=
TARGET_PATH=$(CURDIR)
TARGET_SAMPLES=$(SAMPLES)
CFLAGS-ffplay=
@@ -217,6 +217,7 @@ HAVE_SETEND=yes
!HAVE_I686=yes
!HAVE_MIPSFPU=yes
!HAVE_MIPS32R2=yes
+!HAVE_MIPS32R5=yes
!HAVE_MIPS64R2=yes
!HAVE_MIPS32R6=yes
!HAVE_MIPS64R6=yes
@@ -260,6 +261,7 @@ HAVE_SETEND_EXTERNAL=yes
!HAVE_I686_EXTERNAL=yes
!HAVE_MIPSFPU_EXTERNAL=yes
!HAVE_MIPS32R2_EXTERNAL=yes
+!HAVE_MIPS32R5_EXTERNAL=yes
!HAVE_MIPS64R2_EXTERNAL=yes
!HAVE_MIPS32R6_EXTERNAL=yes
!HAVE_MIPS64R6_EXTERNAL=yes
@@ -303,6 +305,7 @@ HAVE_SETEND_INLINE=yes
!HAVE_I686_INLINE=yes
!HAVE_MIPSFPU_INLINE=yes
!HAVE_MIPS32R2_INLINE=yes
+!HAVE_MIPS32R5_INLINE=yes
!HAVE_MIPS64R2_INLINE=yes
!HAVE_MIPS32R6_INLINE=yes
!HAVE_MIPS64R6_INLINE=yes
@@ -538,8 +541,8 @@ CONFIG_MUXERS=yes
CONFIG_PROTOCOLS=yes
!CONFIG_DOC=yes
!CONFIG_HTMLPAGES=yes
-CONFIG_MANPAGES=yes
-CONFIG_PODPAGES=yes
+!CONFIG_MANPAGES=yes
+!CONFIG_PODPAGES=yes
!CONFIG_TXTPAGES=yes
CONFIG_AVIO_READING_EXAMPLE=yes
CONFIG_AVIO_DIR_CMD_EXAMPLE=yes