From ea1c82c6588e81a4e877924746f5660143693e84 Mon Sep 17 00:00:00 2001
From: Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet@gmail.com>
Date: Tue, 18 Sep 2018 17:36:56 +0200
Subject: [PATCH] contrib: aom: fix cpu detection

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 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
-- 
2.11.4.GIT