From 15062a22d45aa51c061cb0e8e5071c2a9ccfc727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Fri, 14 Oct 2022 10:33:17 +0200
Subject: [PATCH] WebM: Fix Android armv7 build after #64839

---
 modules/webm/libvpx/SCsub | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub
index 46bd7bf652f..68b34698980 100644
--- a/modules/webm/libvpx/SCsub
+++ b/modules/webm/libvpx/SCsub
@@ -312,7 +312,8 @@ if webm_cpu_arm:
         or env["platform"] == "x11"
         or env["platform"] == "server"
     ):
-        env_libvpx["ASFLAGS"] += "-mfpu=neon"
+        # Append to preserve base ASFLAGS on Android.
+        env_libvpx.Append(ASFLAGS=["-mfpu=neon"])
     elif env["platform"] == "uwp":
         env_libvpx["AS"] = "armasm"
         env_libvpx["ASFLAGS"] = ""