diff --git a/Makefile b/Makefile index ae73fd666..6e4642c0b 100644 --- a/Makefile +++ b/Makefile @@ -342,13 +342,13 @@ LIBVPX_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libvpx LIBVPX_CONFIGURE_OPTIONS=--disable-vp9 --disable-examples --disable-unit-tests --disable-postproc --enable-error-concealment --enable-debug $(LIBVPX_SRC_DIR)/configure_android_x86_patch_applied.txt: - @patch -p1 < $(TOPDIR)/patches/libvpx_configure_android_x86.patch + cd $(LIBVPX_SRC_DIR) && patch -p1 < $(TOPDIR)/patches/libvpx_configure_android_x86.patch touch $@ $(LIBVPX_BUILD_DIR)/arm/libvpx.a: mkdir -p $(LIBVPX_BUILD_DIR)/arm && \ cd $(LIBVPX_BUILD_DIR)/arm && \ - $(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \ + $(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --extra-cflags="-mfloat-abi=softfp -mfpu=neon" --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \ make -j${NUMCPUS} \ || ( echo "Build of libvpx for arm failed." ; exit 1 ) diff --git a/patches/libvpx_configure_android_x86.patch b/patches/libvpx_configure_android_x86.patch index 3496853dd..6c7f40e97 100644 --- a/patches/libvpx_configure_android_x86.patch +++ b/patches/libvpx_configure_android_x86.patch @@ -1,36 +1,38 @@ ---- a/submodules/externals/libvpx/build/make/configure.sh -+++ b/submodules/externals/libvpx/build/make/configure.sh -@@ -1037,6 +1037,33 @@ EOF - os2) - AS=${AS:-nasm} - ;; -+ android*) -+ SDK_PATH=${sdk_path} -+ COMPILER_LOCATION=`find "${SDK_PATH}" \ -+ -name "i686-linux-android-gcc*" -print -quit` -+ TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android- -+ CC=${TOOLCHAIN_PATH}gcc -+ CXX=${TOOLCHAIN_PATH}g++ -+ AR=${TOOLCHAIN_PATH}ar -+ LD=${TOOLCHAIN_PATH}gcc -+ STRIP=${TOOLCHAIN_PATH}strip -+ NM=${TOOLCHAIN_PATH}nm +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 25c9f80..336b006 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1082,6 +1082,33 @@ EOF + os2) + AS=${AS:-nasm} + ;; ++ android*) ++ SDK_PATH=${sdk_path} ++ COMPILER_LOCATION=`find "${SDK_PATH}" \ ++ -name "i686-linux-android-gcc*" -print -quit` ++ TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android- ++ CC=${TOOLCHAIN_PATH}gcc ++ CXX=${TOOLCHAIN_PATH}g++ ++ AR=${TOOLCHAIN_PATH}ar ++ LD=${TOOLCHAIN_PATH}gcc ++ STRIP=${TOOLCHAIN_PATH}strip ++ NM=${TOOLCHAIN_PATH}nm + -+ if [ -z "${alt_libc}" ]; then -+ alt_libc=`find "${SDK_PATH}" -name arch-x86 -print | \ -+ awk '{n = split($0,a,"/"); \ -+ split(a[n-1],b,"-"); \ -+ print $0 " " b[2]}' | \ -+ sort -g -k 2 | \ -+ awk '{ print $1 }' | tail -1` -+ fi ++ if [ -z "${alt_libc}" ]; then ++ alt_libc=`find "${SDK_PATH}" -name arch-x86 -print | \ ++ awk '{n = split($0,a,"/"); \ ++ split(a[n-1],b,"-"); \ ++ print $0 " " b[2]}' | \ ++ sort -g -k 2 | \ ++ awk '{ print $1 }' | tail -1` ++ fi + -+ add_cflags "--sysroot=${alt_libc}" -+ add_ldflags "--sysroot=${alt_libc}" ++ add_cflags "--sysroot=${alt_libc}" ++ add_ldflags "--sysroot=${alt_libc}" + -+ soft_enable realtime_only -+ ;; ++ soft_enable realtime_only ++ ;; + - esac + esac - AS="${alt_as:-${AS:-auto}}" + AS="${alt_as:-${AS:-auto}}" diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx index 2e88f2f2e..c74bf6d88 160000 --- a/submodules/externals/libvpx +++ b/submodules/externals/libvpx @@ -1 +1 @@ -Subproject commit 2e88f2f2ec777259bda1714e72f1ecd2519bceb5 +Subproject commit c74bf6d889992c3cabe017ec353ca85c323107cd