[vlc-commits] contrib: aom: fix cpu detection

[Victorien Le Couviour--Tuffet]

vlc | branch: master | Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet at gmail.com> | Tue Sep 18 17:36:56 2018 +0200| [ea1c82c6588e81a4e877924746f5660143693e84] | committer: Thomas Guillem

contrib: aom: fix cpu detection

Fixes android NDK 17 build

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea1c82c6588e81a4e877924746f5660143693e84
---

 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 94e4ad5eaf..40f1522dc3 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -77,6 +77,16 @@ AOM_CONF += -DAOM_TARGET_CPU=armv7
 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