Commit e851e1b2 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

contrib: vpx: Fix android arm64 builds

parent c90692eb
......@@ -39,9 +39,10 @@ cpu-features.c. Additionally, we don't need to link with pthread.
TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/arm-linux-androideabi-
- CC=${TOOLCHAIN_PATH}gcc
- CXX=${TOOLCHAIN_PATH}g++
- AR=${TOOLCHAIN_PATH}ar
+ CC=clang
+ CXX=clang++
AR=${TOOLCHAIN_PATH}ar
+ AR=llvm-ar
LD=${TOOLCHAIN_PATH}gcc
AS=${TOOLCHAIN_PATH}as
@@ -948,7 +948,8 @@
......@@ -74,3 +75,22 @@ cpu-features.c. Additionally, we don't need to link with pthread.
%if CONFIG_POSTPROC=1 || CONFIG_VP9_POSTPROC=1
%ifdef __ANDROID__
extern sym(lrand48)
--- libvpx/build/make/configure.sh.old 2018-12-06 14:15:31.119934158 +0100
+++ libvpx/build/make/configure.sh 2018-12-06 14:15:45.883934102 +0100
@@ -950,13 +950,12 @@
add_ldflags "--sysroot=${alt_libc}"
fi
- # linker flag that routes around a CPU bug in some
- # Cortex-A8 implementations (NDK Dev Guide)
- add_ldflags "-Wl,--fix-cortex-a8"
-
enable_feature pic
soft_enable realtime_only
if [ ${tgt_isa} = "armv7" ]; then
+ # linker flag that routes around a CPU bug in some
+ # Cortex-A8 implementations (NDK Dev Guide)
+ add_ldflags "-Wl,--fix-cortex-a8"
soft_enable runtime_cpu_detect
fi
if enabled runtime_cpu_detect; then
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment