2
0
Эх сурвалжийг харах

Merge pull request #67386 from akien-mga/3.x-webm-armv7-fixup

WebM: Fix Android armv7 build after #64839
Rémi Verschelde 2 жил өмнө
parent
commit
71f5bb3916

+ 2 - 1
modules/webm/libvpx/SCsub

@@ -312,7 +312,8 @@ if webm_cpu_arm:
         or env["platform"] == "x11"
         or env["platform"] == "x11"
         or env["platform"] == "server"
         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":
     elif env["platform"] == "uwp":
         env_libvpx["AS"] = "armasm"
         env_libvpx["AS"] = "armasm"
         env_libvpx["ASFLAGS"] = ""
         env_libvpx["ASFLAGS"] = ""