Commit 530b1c0e authored by Victorien Le Couviour--Tuffet's avatar Victorien Le Couviour--Tuffet Committed by Thomas Guillem

contrib: aom: fix cpufeatures support

Fixes android NDK 17 build
parent ea1c82c6
diff --git a/aom_ports/aom_ports.cmake b/aom_ports/aom_ports.cmake
index 6272fc0..2d795f8 100644
--- a/aom_ports/aom_ports.cmake
+++ b/aom_ports/aom_ports.cmake
@@ -30,7 +30,8 @@ list(APPEND AOM_PORTS_ASM_X86 "${AOM_ROOT}/aom_ports/emms.asm")
list(APPEND AOM_PORTS_INCLUDES_X86 "${AOM_ROOT}/aom_ports/x86_abi_support.asm")
list(APPEND AOM_PORTS_SOURCES_ARM "${AOM_ROOT}/aom_ports/arm.h"
- "${AOM_ROOT}/aom_ports/arm_cpudetect.c")
+ "${AOM_ROOT}/aom_ports/arm_cpudetect.c"
+ "${AOM_ROOT}/aom_ports/cpu-features.c")
list(APPEND AOM_PORTS_SOURCES_PPC "${AOM_ROOT}/aom_ports/ppc.h"
"${AOM_ROOT}/aom_ports/ppc_cpudetect.c")
diff --git a/aom_ports/arm_cpudetect.c b/aom_ports/arm_cpudetect.c
index 70efee9..86efb8e 100644
--- a/aom_ports/arm_cpudetect.c
+++ b/aom_ports/arm_cpudetect.c
@@ -88,7 +88,7 @@ int arm_cpu_caps(void) {
}
#elif defined(__ANDROID__) /* end _MSC_VER */
-#include <cpu-features.h>
+#include "cpu-features.h"
int arm_cpu_caps(void) {
int flags;
......@@ -25,8 +25,12 @@ ifdef HAVE_WINSTORE
endif
ifdef HAVE_ANDROID
$(APPLY) $(SRC)/aom/aom-android-pthreads.patch
$(APPLY) $(SRC)/aom/aom-android-cpufeatures.patch
endif
$(MOVE)
ifdef HAVE_ANDROID
cp $(ANDROID_NDK)/sources/android/cpufeatures/cpu-features.c $(ANDROID_NDK)/sources/android/cpufeatures/cpu-features.h aom/aom_ports/
endif
DEPS_aom =
ifdef HAVE_WIN32
......
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