[vlc-commits] contrib: aom: conditionnaly enable NEON and set AS_EXECUTABLE

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Tue Nov 26 10:56:41 2019 +0100| [3d9d163944f570fdcf9db943fe39021ca0c650a5] | committer: Thomas Guillem

contrib: aom: conditionnaly enable NEON and set AS_EXECUTABLE

Without the correct configuration, it will raise errors.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 contrib/src/aom/rules.mak | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index ee1df0b77e..457b5faa1e 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -48,6 +48,12 @@ AOM_CONF := \
 	-DCONFIG_INSTALL_DOCS=0 \
 	-DCONFIG_DEPENDENCY_TRACKING=0
 
+ifdef HAVE_NEON
+AOM_CONF += -DENABLE_NEON=ON
+else
+AOM_CONF += -DENABLE_NEON=OFF
+endif
+
 ifndef BUILD_ENCODERS
 AOM_CONF += -DCONFIG_AV1_ENCODER=0
 endif
@@ -76,6 +82,12 @@ endif
 
 # Force cpu detection
 ifdef HAVE_ANDROID
+ifneq ($(ARCH),x86)
+ifneq ($(ARCH),x86_64)
+AOM_CONF += -DAS_EXECUTABLE="$(AS)"
+endif
+endif
+
 ifeq ($(ARCH),aarch64)
 AOM_CONF += -DAOM_TARGET_CPU=arm64
 endif