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

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Jan 23 14:00:58 2020 +0100| [98560e0b887e7bf06e8fd1c58aff6fd372e35e46] | committer: Thomas Guillem

Revert "contrib: aom: conditionnaly enable NEON and set AS_EXECUTABLE"

This break x86 build with NDK21.

This reverts commit 3d9d163944f570fdcf9db943fe39021ca0c650a5.

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

 contrib/src/aom/rules.mak | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index 457b5faa1e..ee1df0b77e 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -48,12 +48,6 @@ 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
@@ -82,12 +76,6 @@ 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