WebM: Fix Android armv7 build after #64839

2022-10-14 10:33:17 +02:00 · 2022-10-14 10:33:17 +02:00 · 15062a22d4
parent 2b1544b4f4
commit 15062a22d4
1 changed files with 2 additions and 1 deletions
--- 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"] = ""