From bacbe4a4a906d2684f1b1ef2b51e4f4f5a3b8c7b Mon Sep 17 00:00:00 2001
From: Javernaut <javernaut@gmail.com>
Date: Thu, 21 Oct 2021 13:42:23 +0300
Subject: [PATCH] Disabling neon for libvpx in case llvm and armv7

---
 scripts/export-build-variables.sh | 5 +++++
 scripts/libvpx/build.sh           | 3 +++
 scripts/libvpx/download.sh        | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/export-build-variables.sh b/scripts/export-build-variables.sh
index 7f69983..2ef4ac1 100755
--- a/scripts/export-build-variables.sh
+++ b/scripts/export-build-variables.sh
@@ -82,6 +82,11 @@ export FAM_CC=${TOOLCHAIN_PATH}/bin/${TARGET}-clang
 export FAM_CXX=${FAM_CC}++
 export FAM_LD=${FAM_CC}
 
+if [[ $DESIRED_BINUTILS == "llvm" ]]; then
+  # The llvm-as doesn't work in place of gnu as, so just using clang here
+  export FAM_AS=${FAM_CC}
+fi
+
 # TODO consider abondaning this strategy of defining the name of the clang wrapper
 # in favour of just passing -mstackrealign and -fno-addrsig depending on
 # ANDROID_ABI, ANDROID_PLATFORM and NDK's version
diff --git a/scripts/libvpx/build.sh b/scripts/libvpx/build.sh
index 566c594..e2b7b66 100755
--- a/scripts/libvpx/build.sh
+++ b/scripts/libvpx/build.sh
@@ -13,6 +13,9 @@ case $ANDROID_ABI in
     ;;
   armeabi-v7a)
     EXTRA_BUILD_FLAGS="--target=armv7-android-gcc --enable-thumb"
+    if [[ $DESIRED_BINUTILS == "llvm" ]]; then
+      EXTRA_BUILD_FLAGS+=" --disable-neon"
+    fi
     ;;
   arm64-v8a)
     EXTRA_BUILD_FLAGS="--target=arm64-android-gcc --enable-thumb"
diff --git a/scripts/libvpx/download.sh b/scripts/libvpx/download.sh
index 4730d80..82d2167 100755
--- a/scripts/libvpx/download.sh
+++ b/scripts/libvpx/download.sh
@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-VPX_VERSION=v1.10.0
+VPX_VERSION=v1.11.0
 
 downloadTarArchive \
   "libvpx" \