[vlc-devel] [PATCH 04/13] contrib: aom: fix cpu detection

[Victorien Le Couviour--Tuffet]

Fixes android NDK 17 build
---
 contrib/src/aom/rules.mak | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index e704862ca5..7edf3a9f62 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -66,6 +66,16 @@ AOM_CONF += -DAOM_ADS2GAS_REQUIRED=1 -DAOM_ADS2GAS=../build/make/ads2gas.pl -DAO
 endif
 endif
 
+# Force cpu detection
+ifdef HAVE_ANDROID
+ifeq ($(ARCH),arm)
+AOM_CONF += -DAOM_TARGET_CPU=armv7
+endif
+ifeq ($(ARCH),aarch64)
+AOM_CONF += -DAOM_TARGET_CPU=arm64
+endif
+endif
+
 # libaom doesn't allow in-tree builds
 .aom: aom toolchain.cmake
 	cd $< && mkdir -p aom_build
-- 
2.19.0