Manual merge of version 115.15.0esr-1+rpi1 and 128.11.0esr-1 to produce 128.11.0esr...

diff --cc build/moz.configure/rust.configure
Simple merge

diff --cc debian/changelog
index 1b9969d651932b3bef467553f7abd6238c9d61de,a4934e552dbeb8bfb7eb714385054c000fbb9594..16f168348196b389fd8d1346d2d5ca4a7b9e5568
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,57 -1,219 +1,254 @@@
- firefox-esr (115.15.0esr-1+rpi1) trixie-staging; urgency=medium
++firefox-esr (128.11.0esr-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
 +  [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green]
 +  * Clean up pycache directories.
 +  * Disable neon in qcms.
 +
 +  [changes brought over from thunderbird 1:91.3.2-1+rpi1 by Peter Michael Green]
 +  * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting
 +    definitions error.
 +
 +  [changes brought over from thunderbird 1:102.1.1-1+rpi1 by Peter Michael Green]
 +  * Disable more armv7/neon stuff.
 +
 +  [changes introduced in 102.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable jit (or at least try to)
 +    + Pass disable-jit from debian/rules
 +    + Nerf jit detection in s/moz.configure
 +
 +  [changes introduced in 115.3.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable conflicting include in js/src/jit/shared/AtomicOperations-shared-jit.cpp
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Sep 2024 03:57:03 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Jun 2025 10:13:44 +0000
 +
- firefox-esr (115.15.0esr-1) unstable; urgency=medium
+ firefox-esr (128.11.0esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2024-41, also known as:
-     CVE-2024-8381, CVE-2024-8382, CVE-2024-8383, CVE-2024-8384.
+   * Fixes for mfsa2025-44, also known as:
+     CVE-2025-5263, CVE-2025-5264, CVE-2025-5266, CVE-2025-5267,
+     CVE-2025-5268, CVE-2025-5269.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 04 Sep 2024 05:28:04 +0900
+  -- Mike Hommey <glandium@debian.org>  Wed, 28 May 2025 10:55:09 +0900
  
- firefox-esr (115.14.0esr-1) unstable; urgency=medium
+ firefox-esr (128.10.1esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2024-34, also known as:
-     CVE-2024-7519, CVE-2024-7521, CVE-2024-7522, CVE-2024-7524,
-     CVE-2024-7525, CVE-2024-7526, CVE-2024-7527, CVE-2024-7529,
-     CVE-2024-7531.
+   * Fixes for mfsa2025-37, also known as CVE-2025-4920, CVE-2025-4921.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 07 Aug 2024 07:10:56 +0900
+  -- Mike Hommey <glandium@debian.org>  Sun, 18 May 2025 06:41:48 +0900
  
- firefox-esr (115.13.0esr-2) unstable; urgency=medium
+ firefox-esr (128.10.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2025-29, also known as:
+     CVE-2025-4083, CVE-2025-4087, CVE-2025-4091, CVE-2025-4093.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 30 Apr 2025 07:50:47 +0900
+ 
+ firefox-esr (128.9.0esr-2) unstable; urgency=medium
+ 
+   * debian/rules: Fix application icon names.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 02 Apr 2025 10:53:57 +0900
+ 
+ firefox-esr (128.9.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2025-22, also known as:
+     CVE-2025-3028, CVE-2025-3029, CVE-2025-3030.
+ 
+   * debian/browser.dirs.in, debian/browser.links.in, debian/rules: Move
+     desktop icons to /usr/share/icons/hicolor/* and symlink them from
+     /usr/lib/$browser/browser/chrome/icons/default. Closes: #1091523.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 02 Apr 2025 05:45:12 +0900
+ 
+ firefox-esr (128.8.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2025-16, also known as:
+     CVE-2024-43097, CVE-2025-1931, CVE-2025-1932, CVE-2025-1933,
+     CVE-2025-1934, CVE-2025-1935, CVE-2025-1936, CVE-2025-1937,
+     CVE-2025-1938.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 05 Mar 2025 05:39:57 +0900
+ 
+ firefox-esr (128.7.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2025-09, also known as:
+     CVE-2025-1009, CVE-2025-1010, CVE-2025-1011, CVE-2025-1012,
+     CVE-2025-1013, CVE-2025-1014, CVE-2025-1016, CVE-2025-1017.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 05 Feb 2025 06:07:22 +0900
+ 
+ firefox-esr (128.6.0esr-4) unstable; urgency=medium
+ 
+   * third_party/wasm2c/src/prebuilt/wasm2c_simd_source_declarations.cc,
+     third_party/wasm2c/src/prebuilt/wasm2c_source_declarations.cc: Apply
+     wasm2c upstream fix for clang targetting mips.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 22 Jan 2025 13:04:22 +0900
+ 
+ firefox-esr (128.6.0esr-3) unstable; urgency=medium
+ 
+   * gfx/ycbcr/yuv_convert_arm.cpp: Move the .fpu neon directive around.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 22 Jan 2025 08:04:23 +0900
+ 
+ firefox-esr (128.6.0esr-2) unstable; urgency=medium
+ 
+   * debian/rules:
+     - Properly enable clang only on trixie. Thanks David Turner.
+     - Revert work around for some binutils change. Upstream has had a fix for
+       it for a while now.
+ 
+   * gfx/cairo/libpixman/src/moz.build: Don't use clang clang's integrated
+     assembler to compile pixman ARM neon code.
+ 
+  -- Mike Hommey <glandium@debian.org>  Tue, 21 Jan 2025 14:38:38 +0900
+ 
+ firefox-esr (128.6.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2025-02, also known as:
+     CVE-2025-0237, CVE-2025-0238, CVE-2025-0239, CVE-2025-0240,
+     CVE-2025-0241, CVE-2025-0242, CVE-2025-0243.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 08 Jan 2025 05:45:21 +0900
+ 
+ firefox-esr (128.5.1esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+   * debian/rules: Switch to clang as the compiler for trixie.
+ 
+   * python/mach/mach/site.py: Fix virtual environment sysconfig path
+     calculation. bz#1935621.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 11 Dec 2024 08:52:21 +0900
+ 
+ firefox-esr (128.5.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-64, also known as:
+     CVE-2024-11691, CVE-2024-11692, CVE-2024-11694, CVE-2024-11695,
+     CVE-2024-11696, CVE-2024-11697, CVE-2024-11699.
+ 
+   * debian/control*: Build depend on libdbus-1-dev rather than
+     libdbus-glib-1-dev. Closes: #955891.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 27 Nov 2024 09:12:42 +0900
+ 
+ firefox-esr (128.4.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-56, also known as:
+     CVE-2024-10458, CVE-2024-10459, CVE-2024-10460, CVE-2024-10461,
+     CVE-2024-10462, CVE-2024-10463, CVE-2024-10464, CVE-2024-10465,
+     CVE-2024-10466, CVE-2024-10467.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 30 Oct 2024 06:15:11 +0900
+ 
+ firefox-esr (128.3.1esr-2) unstable; urgency=medium
+ 
+   * debian/rules: Exclude -g from CXXFLAGS too. It's handled by the upstream
+     build system, and leaving it there breaks the build on 32-bits platforms
+     because the debug info is just too large to handle for the address space.
+     That's how it was before the changes in 128.3.1esr-1 anyways.
+ 
+  -- Mike Hommey <glandium@debian.org>  Thu, 10 Oct 2024 11:17:26 +0900
+ 
+ firefox-esr (128.3.1esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-51, also known as CVE-2024-9680.
+ 
+   * debian/rules: Get CXXFLAGS from dpkg-buildflags directly instead of
+     deriving it from CFLAGS.
+   * debian/control*: Remove build dependency on yasm.
+   * debian/browser.lintian-overrides.in: Adjust lintian overrides for
+     the lintian version in unstable.
+ 
+  -- Mike Hommey <glandium@debian.org>  Thu, 10 Oct 2024 05:46:02 +0900
+ 
+ firefox-esr (128.3.0esr-2) unstable; urgency=medium
+ 
+   * debian/watch: Refreshed for firefox-esr.
+   * debian/rules:
+     - Fixed manual page header for firefox-esr.
+     - Use a single virtualenv for preprocessing and build.
+   * debian/iceweasel.*: Remove the remaining iceweasel files.
+   * debian/control*:
+     - Remove unnecessary dependency on autotools-dev.
+     - Remove explicit dependency on dpkg-dev.
+     - Remove Breaks: xul-ext-torbutton. The package was removed in bug
+       #796316, 9 years ago.
+   * debian/browser.lintian-overrides.in: Updated.
+   * debian/source/lintian-overrides: Updated.
+   * debian/copyright: Updated.
+ 
+   * js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h,
+     js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp,
+     js/src/jit/mips-shared/MacroAssembler-mips-shared.h,
+     js/src/jit/mips64/MacroAssembler-mips64.cpp,
+     js/src/jit/mips64/MacroAssembler-mips64.h,
+     js/src/wasm/WasmGenerator.cpp, js/src/wasm/WasmSummarizeInsn.cpp: Fix
+     FTBFS on mipsel64. bz#1855960.
+ 
+  -- Mike Hommey <glandium@debian.org>  Sat, 05 Oct 2024 11:11:02 +0900
+ 
+ firefox-esr (128.3.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-47, also known as:
+     CVE-2024-9392, CVE-2024-9393, CVE-2024-9394, CVE-2024-8900,
+     CVE-2024-9396, CVE-2024-9397, CVE-2024-9398, CVE-2024-9399,
+     CVE-2024-9400, CVE-2024-9401, CVE-2024-9402.
+ 
+   * debian/control.in: Use rustc-web and cbindgen-web on bookworm and bullseye.
+   * debian/control.in, debian/rules: Use gcc-11 on bookworm, working around
+     #1056561.
+   * debian/browser.mozconfig.in, debian/browser.preinst.in, debian/control.in,
+     debian/l10n/browser-l10n.control, debian/l10n/browser-l10n.control.in,
+     debian/l10n/gen, debian/rules, debian/upstream.mk: Remove support for
+     buster.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 02 Oct 2024 07:53:32 +0900
+ 
+ firefox-esr (128.2.0esr-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2024-40, also known as:
+     CVE-2024-8385, CVE-2024-8381, CVE-2024-8382, CVE-2024-8383,
+     CVE-2024-8384, CVE-2024-8386, CVE-2024-8387.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 04 Sep 2024 06:29:13 +0900
+ 
+ firefox-esr (128.1.0esr-1) UNRELEASED; urgency=medium
+ 
+   * Fixes for mfsa2024-35, also known as:
+     CVE-2024-7518, CVE-2024-7519, CVE-2024-7520, CVE-2024-7521,
+     CVE-2024-7522, CVE-2024-7524, CVE-2024-7525, CVE-2024-7526,
+     CVE-2024-7527, CVE-2024-7528, CVE-2024-7529, CVE-2024-7531.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 07 Aug 2024 07:35:48 +0900
+ 
+ firefox (128.0.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
  
    * gfx/cairo/libpixman/src/pixman-arm-simd-asm.S: Adjust arm assembly for
      binutils change.

diff --cc debian/patches/series
index e404b08b7fa97c90be68c59640475f6ba49af60f,1a25b3e8f93b49f92c16563dedbafb2fb055cfae..4c4f000ba7153ce5747814a2145a34fd37de6f73
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -15,12 -17,4 +17,12 @@@ debian-hacks/Allow-.js-preference-files
  debian-hacks/Set-DPI-to-system-settings.patch
  debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch
  debian-hacks/Work-around-GCC-ICE-on-ppc64el.patch
- debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch
+ debian-hacks/Adjust-our-gfx-skia-moz.build-patch-to-upstream-chan.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch
 +disable-neon-in-qcms.patch
 +use-a-define-instead-of-a-typedef-for-do.patch
 +disable-more-armv7neon-stuff.patch
 +disable-jit.patch
 +disable-conflicting-include.patch

diff --cc debian/rules
index e72d4234adeb839e0a528c4407976e2270d2c03b,eb6dd1b73d03493f41ea7febddab9571be28dd11..ece76cc17090d1d07704e9e5e6aee50d93808f8e
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -136,23 -114,46 +116,46 @@@ ifneq (,$(filter armhf mips%,$(DEB_HOST
  endif
  
  ifeq (default,$(origin CC))
+ ifneq (,$(filter-out bullseye bookworm,$(DIST)))
+ CC := clang
+ else
+ ifeq ($(DIST),bookworm)
+ CC := gcc-11
+ else
  CC := gcc
  endif
+ endif
+ endif
  ifeq (default,$(origin CXX))
+ ifneq (,$(filter-out bullseye bookworm,$(DIST)))
+ CXX := clang++
+ else
+ ifeq ($(DIST),bookworm)
+ CXX := g++-11
+ else
  CXX := g++
  endif
+ endif
+ endif
+ 
+ # When using clang, the build system uses ld.lld instead of BFD ld.
+ ifeq (,$(findstring clang,$(CC)))
+ # Reduce memory usage of the linker at the expense of processing time
+ # This should help on lower-end architectures like arm and mips, which
+ # spend an immense amount of time swapping.
+ LDFLAGS += -Wl,--reduce-memory-overheads
+ # Work around https://sourceware.org/bugzilla/show_bug.cgi?id=30566
+ ifeq (,$(filter i386 amd64 ppc64%,$(DEB_HOST_ARCH)))
+ LDFLAGS += -Wl,--no-keep-memory
+ endif
+ endif
+ # Also add execution time and memory usage stats in the logs
+ LDFLAGS += -Wl,--stats
  
 -ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
 +#ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
  CONFIGURE_FLAGS += --disable-jit
 -endif
 +#endif
  
- CXXFLAGS := $(CFLAGS)
- # Work around https://sourceware.org/bugzilla/show_bug.cgi?id=30578
- ifneq (,$(filter trixie,$(DIST)))
- ifneq (,$(filter amd64,$(DEB_HOST_ARCH)))
- CFLAGS += -DFFMPEG_DISABLE_INLINE_ASM
- endif
- endif
  RUSTFLAGS = --remap-path-prefix=$(CURDIR)=.
  
  EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MOZILLA_OFFICIAL RUSTFLAGS
@@@ -180,25 -181,16 +183,17 @@@ debian/l10n/$(PRODUCT)-l10n.control: %
  
  $(call lazy,LIBAVCODEC,$$(shell awk -F\" '/libavcodec\.so\./ { sub(/libavcodec\.so\./,"", $$$$2); p = "libavcodec" $$$$2 " | libavcodec-extra" $$$$2; if (d) { d = d " | " p } else { d = p } } END { print d }' dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp))
  
- $(PREPROCESSED_FILES): VARS = GRE_VERSION PRODUCT_DOWNLOAD_NAME $(PRODUCT) $(call uc,$(PRODUCT)) $(Product) MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) SHORT_SOURCE_CHANNEL DIST TRANSITION MOZ_FFVPX CRASH_REPORTER DEB_HOST_ARCH
+ $(PREPROCESSED_FILES): stamps/mozbuild-state
+ stamps/mozbuild-state::
+       MOZ_OBJDIR=debian/objdir MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none $(PYTHON) ./mach python --virtualenv build -c ""
+ 
+ $(PREPROCESSED_FILES): VARS = GRE_VERSION PRODUCT_DOWNLOAD_NAME $(PRODUCT) $(call uc,$(PRODUCT)) $(Product) MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) SHORT_SOURCE_CHANNEL DIST MOZ_ENABLE_V4L2 CRASH_REPORTER DEB_HOST_ARCH
  debian/control: VARS += L10N_PACKAGES_DEPS PRODUCT LIBAVCODEC
  $(PREPROCESSED_FILES):
-       MOZ_OBJDIR=debian/objdir MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none $(PYTHON) ./mach python python/mozbuild/mozbuild/preprocessor.py --marker % -Fsubstitution $(foreach var,$(VARS),-D$(var)="$($(var))" )$< -o $@
- 
- ifdef TRANSITION
- MAINTSCRIPTS := $(addprefix debian/,$(addsuffix .maintscript,$(shell awk -F/ '$$1 != "searchplugins" { next } $$2 == "locale" && $$3 != "en-US" { p="iceweasel-l10n-" $$3 } $$2 == "common" || ($$2 "/" $$3 == "locale/en-US") { p="iceweasel" } !done[p] { print p; done[p] = 1 }' debian/removed_conffiles)))
- 
- GENERATED_FILES += $(MAINTSCRIPTS)
- 
- debian/iceweasel.maintscript: debian/removed_conffiles
-       (grep -v searchplugins/locale $<; grep searchplugins/locale/en-US $<) | awk '{print "rm_conffile /etc/iceweasel/" $$0, "45.0esr-2~", "iceweasel"}' > $@
- 
- debian/iceweasel-l10n-%.maintscript: debian/removed_conffiles
-       grep -i searchplugins/locale/$* $< | awk '{print "rm_conffile /etc/iceweasel/" $$0, "45.0esr-2~", "iceweasel-l10n-$*"}' > $@
- endif
+       MOZ_OBJDIR=debian/objdir MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none $(PYTHON) ./mach python --virtualenv build python/mozbuild/mozbuild/preprocessor.py --marker % -Fsubstitution $(foreach var,$(VARS),-D$(var)="$($(var))" )$< -o $@
  
  override_dh_auto_configure:
 +      mkdir -p fakehome
  
  stamps/configure-check-$(PRODUCT):: stamps/configure-$(PRODUCT)
  # Ensure --{with,enable}-system options properly set expected variables

diff --cc gfx/qcms/src/transform.rs
Simple merge

diff --cc gfx/ycbcr/moz.build
index e715f1a94fce8aa274d124ca8846a90cad8c9768,3c1a96409c29cd53a986f48da7ad9d3b690f4517..dcbacd67aded8284beedb2166922f5a4603dc914
--- 1/gfx/ycbcr/moz.build
--- 2/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@@ -53,13 -53,13 +53,13 @@@ else
          'yuv_row_other.cpp',
      ]
  
- #if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
 -if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
 -    SOURCES += [
 -        'yuv_row_arm.s',
 -    ]
 -    SOURCES += [
 -        'yuv_convert_arm.cpp',
 -    ]
++#if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
 +#    SOURCES += [
 +#        'yuv_row_arm.s',
 +#    ]
 +#    SOURCES += [
 +#        'yuv_convert_arm.cpp',
 +#    ]
  
  LOCAL_INCLUDES += ['/media/libyuv/libyuv/include']
  

diff --cc js/moz.configure
index ad8d4753b1746730ad43abf938567518036a9a7a,593b93aceee7dfdf9bec976f20a718fee9d65c98..16f97c78b24e6c67ed9dd7ad990986cc88c67c2f
--- 1/js/moz.configure
--- 2/js/moz.configure
+++ b/js/moz.configure
@@@ -173,22 -173,100 +173,100 @@@ def enable_decorators(value)
  set_config("ENABLE_DECORATORS", enable_decorators)
  set_define("ENABLE_DECORATORS", enable_decorators)
  
+ # Enable explicit resource management
+ # ===================================================
+ option(
+     "--enable-explicit-resource-management",
+     default=False,
+     help="Enable explicit resource management",
+ )
+ 
+ 
+ @depends("--enable-explicit-resource-management")
+ def enable_explicit_resource_management(value):
+     if value:
+         return True
+ 
+ 
+ set_config("ENABLE_EXPLICIT_RESOURCE_MANAGEMENT", enable_explicit_resource_management)
+ set_define("ENABLE_EXPLICIT_RESOURCE_MANAGEMENT", enable_explicit_resource_management)
+ 
+ 
+ # Enable JSON.parse with source
+ # ===================================================
+ @depends(milestone.is_nightly)
+ def enable_json_parse_with_source(is_nightly):
+     if is_nightly:
+         return True
+ 
+ 
+ set_config("ENABLE_JSON_PARSE_WITH_SOURCE", enable_json_parse_with_source)
+ set_define("ENABLE_JSON_PARSE_WITH_SOURCE", enable_json_parse_with_source)
+ 
+ 
+ # Portable Baseline Intepreter
+ # =======================================================
+ option(
+     "--enable-portable-baseline-interp",
+     default=False,
+     help="{Enable|Disable} the portable baseline interpreter.",
+ )
+ set_define(
+     "ENABLE_PORTABLE_BASELINE_INTERP",
+     depends_if("--enable-portable-baseline-interp")(lambda _: True),
+ )
+ set_config(
+     "ENABLE_PORTABLE_BASELINE_INTERP",
+     depends_if("--enable-portable-baseline-interp")(lambda _: True),
+ )
+ 
+ # Option to always force PBL tier.
+ option(
+     "--enable-portable-baseline-interp-force",
+     default=False,
+     help="{Enable|Disable} forcing use of the portable baseline interpreter.",
+ )
+ 
+ set_define(
+     "ENABLE_PORTABLE_BASELINE_INTERP_FORCE",
+     depends_if("--enable-portable-baseline-interp-force")(lambda _: True),
+ )
+ set_config(
+     "ENABLE_PORTABLE_BASELINE_INTERP_FORCE",
+     depends_if("--enable-portable-baseline-interp-force")(lambda _: True),
+ )
+ 
+ 
  # JIT support
  # =======================================================
- @depends(target, "--enable-record-tuple")
- def jit_default(target, enable_record_tuple):
+ @depends(
+     target,
+     "--enable-record-tuple",
+     "--enable-portable-baseline-interp",
+     "--enable-explicit-resource-management",
+ )
+ def jit_default(
+     target,
+     enable_record_tuple,
+     enable_portable_baseline_interp,
+     enable_explicit_resource_management,
+ ):
 -    if enable_record_tuple:
 -        return False
 -    if enable_portable_baseline_interp:
 -        return False
 -    if enable_explicit_resource_management:
 -        return False
 -    if target.cpu in (
 -        "x86",
 -        "x86_64",
 -        "arm",
 -        "aarch64",
 -        "mips32",
 -        "mips64",
 -        "loongarch64",
 -    ):
 -        return True
 +    #if enable_record_tuple:
 +    #    return False
++    #if enable_portable_baseline_interp:
++    #    return False
++    #if enable_explicit_resource_management:
++    #    return False
 +    #if target.cpu in (
 +    #    "x86",
 +    #    "x86_64",
 +    #    "arm",
 +    #    "aarch64",
 +    #    "mips32",
 +    #    "mips64",
 +    #    "loongarch64",
 +    #):
 +    #    return True
      return False
  
  

diff --cc media/libaom/moz.build
index 8396b55851f29bfbc40778ec41c19c737737c464,eb5b22c054236cd6b2f4b35ab3e6ec618db3b779..52b70b46d211ab4a969622e09062e294ae479d6c
--- 1/media/libaom/moz.build
--- 2/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@@ -42,6 -43,31 +43,15 @@@ elif CONFIG['TARGET_CPU'] == 'x86'
          ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
          LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ]
          EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ]
 -elif CONFIG['TARGET_CPU'] == 'arm':
 -    EXPORTS.aom += files['ARM_EXPORTS']
 -    ASFLAGS += [
 -        '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR,
 -        '-I%s/libaom' % OBJDIR,
 -    ]
 -    LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ]
 -    EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ]
 -
 -    SOURCES += files['ARM_SOURCES']
 -
 -    if CONFIG['OS_TARGET'] == 'Android':
 -        # For cpu-features.h
 -        LOCAL_INCLUDES += [
 -            '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'],
 -        ]
+ elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['OS_TARGET'] == 'Darwin':
+     EXPORTS.aom += files['ARM64_EXPORTS']
+     ASFLAGS += [
+         '-I%s/media/libaom/config/mac/arm64/' % TOPSRCDIR,
+         '-I%s/libaom' % OBJDIR,
+     ]
+     LOCAL_INCLUDES += [ '/media/libaom/config/mac/arm64/' ]
+     EXPORTS.aom += [ 'config/mac/arm64/config/aom_config.h' ]
+     SOURCES += files['ARM64_SOURCES']
  else:
      # Generic C-only configuration
      EXPORTS.aom += files['GENERIC_EXPORTS']

diff --cc media/libaom/sources.mozbuild
index 9caf5295726fde0542dbed57f697ec65318e33a5,bbf76dee8e1fb662ba323fa39c1bb4715081898c..1bd6308910f4c9c66d797adbb468fb8aa701c4b2
--- 1/media/libaom/sources.mozbuild
--- 2/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@@ -1,6 -1,561 +1,291 @@@
  # This file is generated. Do not edit.
  
  files = {
 -  'ARM_EXPORTS': [
 -    '../../third_party/aom/aom/aom.h',
 -    '../../third_party/aom/aom/aom_codec.h',
 -    '../../third_party/aom/aom/aom_decoder.h',
 -    '../../third_party/aom/aom/aom_encoder.h',
 -    '../../third_party/aom/aom/aom_external_partition.h',
 -    '../../third_party/aom/aom/aom_frame_buffer.h',
 -    '../../third_party/aom/aom/aom_image.h',
 -    '../../third_party/aom/aom/aom_integer.h',
 -    '../../third_party/aom/aom/aomcx.h',
 -    '../../third_party/aom/aom/aomdx.h',
 -    '../../third_party/aom/aom_mem/aom_mem.h',
 -    '../../third_party/aom/aom_ports/aom_timer.h',
 -    '../../third_party/aom/aom_ports/bitops.h',
 -    '../../third_party/aom/aom_ports/mem.h',
 -    '../../third_party/aom/aom_ports/sanitizer.h',
 -    '../../third_party/aom/aom_scale/aom_scale.h',
 -    '../../third_party/aom/aom_scale/yv12config.h',
 -  ],
 -  'ARM_SOURCES': [
 -    '../../third_party/aom/aom/src/aom_codec.c',
 -    '../../third_party/aom/aom/src/aom_decoder.c',
 -    '../../third_party/aom/aom/src/aom_encoder.c',
 -    '../../third_party/aom/aom/src/aom_image.c',
 -    '../../third_party/aom/aom/src/aom_integer.c',
 -    '../../third_party/aom/aom_dsp/aom_convolve.c',
 -    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
 -    '../../third_party/aom/aom_dsp/arm/aom_convolve8_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/aom_convolve_copy_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/avg_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/avg_pred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/blk_sse_sum_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/hadamard_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_avg_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_avg_pred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_hmask_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_mask_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_vmask_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_convolve8_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_hadamard_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_intrapred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_loopfilter_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_masked_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_obmc_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_obmc_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_quantize_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_sadxd_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_sse_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_subpel_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/masked_sad4d_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/masked_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/obmc_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/obmc_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/sadxd_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/sse_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/subpel_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/sum_squares_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/variance_neon.c',
 -    '../../third_party/aom/aom_dsp/avg.c',
 -    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
 -    '../../third_party/aom/aom_dsp/binary_codes_writer.c',
 -    '../../third_party/aom/aom_dsp/bitreader.c',
 -    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
 -    '../../third_party/aom/aom_dsp/bitwriter.c',
 -    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
 -    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
 -    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
 -    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
 -    '../../third_party/aom/aom_dsp/blk_sse_sum.c',
 -    '../../third_party/aom/aom_dsp/entcode.c',
 -    '../../third_party/aom/aom_dsp/entdec.c',
 -    '../../third_party/aom/aom_dsp/entenc.c',
 -    '../../third_party/aom/aom_dsp/fft.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/arm/disflow_neon.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/corner_detect.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/corner_match.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/disflow.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/flow_estimation.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/ransac.c',
 -    '../../third_party/aom/aom_dsp/fwd_txfm.c',
 -    '../../third_party/aom/aom_dsp/grain_table.c',
 -    '../../third_party/aom/aom_dsp/intrapred.c',
 -    '../../third_party/aom/aom_dsp/loopfilter.c',
 -    '../../third_party/aom/aom_dsp/noise_model.c',
 -    '../../third_party/aom/aom_dsp/noise_util.c',
 -    '../../third_party/aom/aom_dsp/odintrin.c',
 -    '../../third_party/aom/aom_dsp/psnr.c',
 -    '../../third_party/aom/aom_dsp/pyramid.c',
 -    '../../third_party/aom/aom_dsp/quantize.c',
 -    '../../third_party/aom/aom_dsp/sad.c',
 -    '../../third_party/aom/aom_dsp/sad_av1.c',
 -    '../../third_party/aom/aom_dsp/sse.c',
 -    '../../third_party/aom/aom_dsp/ssim.c',
 -    '../../third_party/aom/aom_dsp/subtract.c',
 -    '../../third_party/aom/aom_dsp/sum_squares.c',
 -    '../../third_party/aom/aom_dsp/variance.c',
 -    '../../third_party/aom/aom_mem/aom_mem.c',
 -    '../../third_party/aom/aom_ports/aarch32_cpudetect.c',
 -    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
 -    '../../third_party/aom/aom_scale/generic/aom_scale.c',
 -    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
 -    '../../third_party/aom/aom_scale/generic/yv12config.c',
 -    '../../third_party/aom/aom_scale/generic/yv12extend.c',
 -    '../../third_party/aom/aom_util/aom_thread.c',
 -    '../../third_party/aom/av1/arg_defs.c',
 -    '../../third_party/aom/av1/av1_cx_iface.c',
 -    '../../third_party/aom/av1/av1_dx_iface.c',
 -    '../../third_party/aom/av1/common/alloccommon.c',
 -    '../../third_party/aom/av1/common/arm/av1_convolve_scale_neon.c',
 -    '../../third_party/aom/av1/common/arm/av1_inv_txfm_neon.c',
 -    '../../third_party/aom/av1/common/arm/av1_txfm_neon.c',
 -    '../../third_party/aom/av1/common/arm/blend_a64_hmask_neon.c',
 -    '../../third_party/aom/av1/common/arm/blend_a64_vmask_neon.c',
 -    '../../third_party/aom/av1/common/arm/cdef_block_neon.c',
 -    '../../third_party/aom/av1/common/arm/cfl_neon.c',
 -    '../../third_party/aom/av1/common/arm/compound_convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_compound_convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_convolve_horiz_rs_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_convolve_scale_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_inv_txfm_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_reconinter_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_reconintra_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_warp_plane_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_wiener_convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/reconinter_neon.c',
 -    '../../third_party/aom/av1/common/arm/reconintra_neon.c',
 -    '../../third_party/aom/av1/common/arm/resize_neon.c',
 -    '../../third_party/aom/av1/common/arm/selfguided_neon.c',
 -    '../../third_party/aom/av1/common/arm/warp_plane_neon.c',
 -    '../../third_party/aom/av1/common/arm/wiener_convolve_neon.c',
 -    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
 -    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
 -    '../../third_party/aom/av1/common/av1_loopfilter.c',
 -    '../../third_party/aom/av1/common/av1_rtcd.c',
 -    '../../third_party/aom/av1/common/av1_txfm.c',
 -    '../../third_party/aom/av1/common/blockd.c',
 -    '../../third_party/aom/av1/common/cdef.c',
 -    '../../third_party/aom/av1/common/cdef_block.c',
 -    '../../third_party/aom/av1/common/cfl.c',
 -    '../../third_party/aom/av1/common/common_data.c',
 -    '../../third_party/aom/av1/common/convolve.c',
 -    '../../third_party/aom/av1/common/debugmodes.c',
 -    '../../third_party/aom/av1/common/entropy.c',
 -    '../../third_party/aom/av1/common/entropymode.c',
 -    '../../third_party/aom/av1/common/entropymv.c',
 -    '../../third_party/aom/av1/common/frame_buffers.c',
 -    '../../third_party/aom/av1/common/idct.c',
 -    '../../third_party/aom/av1/common/mvref_common.c',
 -    '../../third_party/aom/av1/common/obu_util.c',
 -    '../../third_party/aom/av1/common/pred_common.c',
 -    '../../third_party/aom/av1/common/quant_common.c',
 -    '../../third_party/aom/av1/common/reconinter.c',
 -    '../../third_party/aom/av1/common/reconintra.c',
 -    '../../third_party/aom/av1/common/resize.c',
 -    '../../third_party/aom/av1/common/restoration.c',
 -    '../../third_party/aom/av1/common/scale.c',
 -    '../../third_party/aom/av1/common/scan.c',
 -    '../../third_party/aom/av1/common/seg_common.c',
 -    '../../third_party/aom/av1/common/thread_common.c',
 -    '../../third_party/aom/av1/common/tile_common.c',
 -    '../../third_party/aom/av1/common/timing.c',
 -    '../../third_party/aom/av1/common/txb_common.c',
 -    '../../third_party/aom/av1/common/warped_motion.c',
 -    '../../third_party/aom/av1/decoder/decodeframe.c',
 -    '../../third_party/aom/av1/decoder/decodemv.c',
 -    '../../third_party/aom/av1/decoder/decoder.c',
 -    '../../third_party/aom/av1/decoder/decodetxb.c',
 -    '../../third_party/aom/av1/decoder/detokenize.c',
 -    '../../third_party/aom/av1/decoder/grain_synthesis.c',
 -    '../../third_party/aom/av1/decoder/obu.c',
 -    '../../third_party/aom/av1/encoder/allintra_vis.c',
 -    '../../third_party/aom/av1/encoder/aq_complexity.c',
 -    '../../third_party/aom/av1/encoder/aq_cyclicrefresh.c',
 -    '../../third_party/aom/av1/encoder/aq_variance.c',
 -    '../../third_party/aom/av1/encoder/arm/av1_error_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/av1_fwd_txfm2d_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/av1_highbd_quantize_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/av1_k_means_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/cnn_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/encodetxb_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/highbd_fwd_txfm_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/highbd_pickrst_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/highbd_rdopt_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/highbd_temporal_filter_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/hybrid_fwd_txfm_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/ml_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/pickrst_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/quantize_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/rdopt_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/reconinter_enc_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/temporal_filter_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/wedge_utils_neon.c',
 -    '../../third_party/aom/av1/encoder/av1_fwd_txfm1d.c',
 -    '../../third_party/aom/av1/encoder/av1_fwd_txfm2d.c',
 -    '../../third_party/aom/av1/encoder/av1_noise_estimate.c',
 -    '../../third_party/aom/av1/encoder/av1_quantize.c',
 -    '../../third_party/aom/av1/encoder/bitstream.c',
 -    '../../third_party/aom/av1/encoder/cnn.c',
 -    '../../third_party/aom/av1/encoder/compound_type.c',
 -    '../../third_party/aom/av1/encoder/context_tree.c',
 -    '../../third_party/aom/av1/encoder/cost.c',
 -    '../../third_party/aom/av1/encoder/dwt.c',
 -    '../../third_party/aom/av1/encoder/encode_strategy.c',
 -    '../../third_party/aom/av1/encoder/encodeframe.c',
 -    '../../third_party/aom/av1/encoder/encodeframe_utils.c',
 -    '../../third_party/aom/av1/encoder/encodemb.c',
 -    '../../third_party/aom/av1/encoder/encodemv.c',
 -    '../../third_party/aom/av1/encoder/encoder.c',
 -    '../../third_party/aom/av1/encoder/encoder_utils.c',
 -    '../../third_party/aom/av1/encoder/encodetxb.c',
 -    '../../third_party/aom/av1/encoder/ethread.c',
 -    '../../third_party/aom/av1/encoder/extend.c',
 -    '../../third_party/aom/av1/encoder/external_partition.c',
 -    '../../third_party/aom/av1/encoder/firstpass.c',
 -    '../../third_party/aom/av1/encoder/global_motion.c',
 -    '../../third_party/aom/av1/encoder/global_motion_facade.c',
 -    '../../third_party/aom/av1/encoder/gop_structure.c',
 -    '../../third_party/aom/av1/encoder/hash.c',
 -    '../../third_party/aom/av1/encoder/hash_motion.c',
 -    '../../third_party/aom/av1/encoder/hybrid_fwd_txfm.c',
 -    '../../third_party/aom/av1/encoder/interp_search.c',
 -    '../../third_party/aom/av1/encoder/intra_mode_search.c',
 -    '../../third_party/aom/av1/encoder/level.c',
 -    '../../third_party/aom/av1/encoder/lookahead.c',
 -    '../../third_party/aom/av1/encoder/mcomp.c',
 -    '../../third_party/aom/av1/encoder/ml.c',
 -    '../../third_party/aom/av1/encoder/motion_search_facade.c',
 -    '../../third_party/aom/av1/encoder/mv_prec.c',
 -    '../../third_party/aom/av1/encoder/nonrd_opt.c',
 -    '../../third_party/aom/av1/encoder/nonrd_pickmode.c',
 -    '../../third_party/aom/av1/encoder/palette.c',
 -    '../../third_party/aom/av1/encoder/partition_search.c',
 -    '../../third_party/aom/av1/encoder/partition_strategy.c',
 -    '../../third_party/aom/av1/encoder/pass2_strategy.c',
 -    '../../third_party/aom/av1/encoder/pickcdef.c',
 -    '../../third_party/aom/av1/encoder/picklpf.c',
 -    '../../third_party/aom/av1/encoder/pickrst.c',
 -    '../../third_party/aom/av1/encoder/ratectrl.c',
 -    '../../third_party/aom/av1/encoder/rd.c',
 -    '../../third_party/aom/av1/encoder/rdopt.c',
 -    '../../third_party/aom/av1/encoder/reconinter_enc.c',
 -    '../../third_party/aom/av1/encoder/segmentation.c',
 -    '../../third_party/aom/av1/encoder/speed_features.c',
 -    '../../third_party/aom/av1/encoder/superres_scale.c',
 -    '../../third_party/aom/av1/encoder/svc_layercontext.c',
 -    '../../third_party/aom/av1/encoder/temporal_filter.c',
 -    '../../third_party/aom/av1/encoder/thirdpass.c',
 -    '../../third_party/aom/av1/encoder/tokenize.c',
 -    '../../third_party/aom/av1/encoder/tpl_model.c',
 -    '../../third_party/aom/av1/encoder/tx_search.c',
 -    '../../third_party/aom/av1/encoder/txb_rdopt.c',
 -    '../../third_party/aom/av1/encoder/var_based_part.c',
 -    '../../third_party/aom/av1/encoder/wedge_utils.c',
 -    '../../third_party/aom/av1/ratectrl_rtc.cc',
 -    '../../third_party/aom/common/args_helper.c',
 -    '../../third_party/aom/third_party/fastfeat/fast.c',
 -    '../../third_party/aom/third_party/fastfeat/fast_9.c',
 -    '../../third_party/aom/third_party/fastfeat/nonmax.c',
 -    '../../third_party/aom/third_party/vector/vector.c',
 -  ],
+   'ARM64_EXPORTS': [
+     '../../third_party/aom/aom/aom.h',
+     '../../third_party/aom/aom/aom_codec.h',
+     '../../third_party/aom/aom/aom_decoder.h',
+     '../../third_party/aom/aom/aom_encoder.h',
+     '../../third_party/aom/aom/aom_external_partition.h',
+     '../../third_party/aom/aom/aom_frame_buffer.h',
+     '../../third_party/aom/aom/aom_image.h',
+     '../../third_party/aom/aom/aom_integer.h',
+     '../../third_party/aom/aom/aomcx.h',
+     '../../third_party/aom/aom/aomdx.h',
+     '../../third_party/aom/aom_mem/aom_mem.h',
+     '../../third_party/aom/aom_ports/aom_timer.h',
+     '../../third_party/aom/aom_ports/bitops.h',
+     '../../third_party/aom/aom_ports/mem.h',
+     '../../third_party/aom/aom_ports/sanitizer.h',
+     '../../third_party/aom/aom_scale/aom_scale.h',
+     '../../third_party/aom/aom_scale/yv12config.h',
+   ],
+   'ARM64_SOURCES': [
+     '../../third_party/aom/aom/src/aom_codec.c',
+     '../../third_party/aom/aom/src/aom_decoder.c',
+     '../../third_party/aom/aom/src/aom_encoder.c',
+     '../../third_party/aom/aom/src/aom_image.c',
+     '../../third_party/aom/aom/src/aom_integer.c',
+     '../../third_party/aom/aom_dsp/aom_convolve.c',
+     '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
+     '../../third_party/aom/aom_dsp/arm/aom_convolve8_neon.c',
+     '../../third_party/aom/aom_dsp/arm/aom_convolve8_neon_dotprod.c',
+     '../../third_party/aom/aom_dsp/arm/aom_convolve8_neon_i8mm.c',
+     '../../third_party/aom/aom_dsp/arm/aom_convolve_copy_neon.c',
+     '../../third_party/aom/aom_dsp/arm/avg_neon.c',
+     '../../third_party/aom/aom_dsp/arm/avg_pred_neon.c',
+     '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c',
+     '../../third_party/aom/aom_dsp/arm/blk_sse_sum_neon.c',
+     '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
+     '../../third_party/aom/aom_dsp/arm/hadamard_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_avg_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_avg_pred_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_hmask_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_mask_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_vmask_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_convolve8_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_hadamard_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_intrapred_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_loopfilter_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_masked_sad_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_obmc_sad_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_obmc_variance_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_quantize_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_sad_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_sadxd_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_sse_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_subpel_variance_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_variance_neon.c',
+     '../../third_party/aom/aom_dsp/arm/highbd_variance_neon_dotprod.c',
+     '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
+     '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
+     '../../third_party/aom/aom_dsp/arm/masked_sad4d_neon.c',
+     '../../third_party/aom/aom_dsp/arm/masked_sad_neon.c',
+     '../../third_party/aom/aom_dsp/arm/obmc_sad_neon.c',
+     '../../third_party/aom/aom_dsp/arm/obmc_variance_neon.c',
+     '../../third_party/aom/aom_dsp/arm/sad_neon.c',
+     '../../third_party/aom/aom_dsp/arm/sad_neon_dotprod.c',
+     '../../third_party/aom/aom_dsp/arm/sadxd_neon.c',
+     '../../third_party/aom/aom_dsp/arm/sadxd_neon_dotprod.c',
+     '../../third_party/aom/aom_dsp/arm/sse_neon.c',
+     '../../third_party/aom/aom_dsp/arm/sse_neon_dotprod.c',
+     '../../third_party/aom/aom_dsp/arm/subpel_variance_neon.c',
+     '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
+     '../../third_party/aom/aom_dsp/arm/sum_squares_neon.c',
+     '../../third_party/aom/aom_dsp/arm/sum_squares_neon_dotprod.c',
+     '../../third_party/aom/aom_dsp/arm/variance_neon.c',
+     '../../third_party/aom/aom_dsp/arm/variance_neon_dotprod.c',
+     '../../third_party/aom/aom_dsp/avg.c',
+     '../../third_party/aom/aom_dsp/binary_codes_reader.c',
+     '../../third_party/aom/aom_dsp/binary_codes_writer.c',
+     '../../third_party/aom/aom_dsp/bitreader.c',
+     '../../third_party/aom/aom_dsp/bitreader_buffer.c',
+     '../../third_party/aom/aom_dsp/bitwriter.c',
+     '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
+     '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
+     '../../third_party/aom/aom_dsp/blend_a64_mask.c',
+     '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
+     '../../third_party/aom/aom_dsp/blk_sse_sum.c',
+     '../../third_party/aom/aom_dsp/entcode.c',
+     '../../third_party/aom/aom_dsp/entdec.c',
+     '../../third_party/aom/aom_dsp/entenc.c',
+     '../../third_party/aom/aom_dsp/fft.c',
+     '../../third_party/aom/aom_dsp/flow_estimation/arm/disflow_neon.c',
+     '../../third_party/aom/aom_dsp/flow_estimation/corner_detect.c',
+     '../../third_party/aom/aom_dsp/flow_estimation/corner_match.c',
+     '../../third_party/aom/aom_dsp/flow_estimation/disflow.c',
+     '../../third_party/aom/aom_dsp/flow_estimation/flow_estimation.c',
+     '../../third_party/aom/aom_dsp/flow_estimation/ransac.c',
+     '../../third_party/aom/aom_dsp/fwd_txfm.c',
+     '../../third_party/aom/aom_dsp/grain_table.c',
+     '../../third_party/aom/aom_dsp/intrapred.c',
+     '../../third_party/aom/aom_dsp/loopfilter.c',
+     '../../third_party/aom/aom_dsp/noise_model.c',
+     '../../third_party/aom/aom_dsp/noise_util.c',
+     '../../third_party/aom/aom_dsp/odintrin.c',
+     '../../third_party/aom/aom_dsp/psnr.c',
+     '../../third_party/aom/aom_dsp/pyramid.c',
+     '../../third_party/aom/aom_dsp/quantize.c',
+     '../../third_party/aom/aom_dsp/sad.c',
+     '../../third_party/aom/aom_dsp/sad_av1.c',
+     '../../third_party/aom/aom_dsp/sse.c',
+     '../../third_party/aom/aom_dsp/ssim.c',
+     '../../third_party/aom/aom_dsp/subtract.c',
+     '../../third_party/aom/aom_dsp/sum_squares.c',
+     '../../third_party/aom/aom_dsp/variance.c',
+     '../../third_party/aom/aom_mem/aom_mem.c',
+     '../../third_party/aom/aom_ports/aarch64_cpudetect.c',
+     '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
+     '../../third_party/aom/aom_scale/generic/aom_scale.c',
+     '../../third_party/aom/aom_scale/generic/gen_scalers.c',
+     '../../third_party/aom/aom_scale/generic/yv12config.c',
+     '../../third_party/aom/aom_scale/generic/yv12extend.c',
+     '../../third_party/aom/aom_util/aom_thread.c',
+     '../../third_party/aom/av1/arg_defs.c',
+     '../../third_party/aom/av1/av1_cx_iface.c',
+     '../../third_party/aom/av1/av1_dx_iface.c',
+     '../../third_party/aom/av1/common/alloccommon.c',
+     '../../third_party/aom/av1/common/arm/av1_convolve_scale_neon.c',
+     '../../third_party/aom/av1/common/arm/av1_inv_txfm_neon.c',
+     '../../third_party/aom/av1/common/arm/av1_txfm_neon.c',
+     '../../third_party/aom/av1/common/arm/blend_a64_hmask_neon.c',
+     '../../third_party/aom/av1/common/arm/blend_a64_vmask_neon.c',
+     '../../third_party/aom/av1/common/arm/cdef_block_neon.c',
+     '../../third_party/aom/av1/common/arm/cfl_neon.c',
+     '../../third_party/aom/av1/common/arm/compound_convolve_neon.c',
+     '../../third_party/aom/av1/common/arm/compound_convolve_neon_dotprod.c',
+     '../../third_party/aom/av1/common/arm/compound_convolve_neon_i8mm.c',
+     '../../third_party/aom/av1/common/arm/convolve_neon.c',
+     '../../third_party/aom/av1/common/arm/convolve_neon_dotprod.c',
+     '../../third_party/aom/av1/common/arm/convolve_neon_i8mm.c',
+     '../../third_party/aom/av1/common/arm/highbd_compound_convolve_neon.c',
+     '../../third_party/aom/av1/common/arm/highbd_convolve_horiz_rs_neon.c',
+     '../../third_party/aom/av1/common/arm/highbd_convolve_neon.c',
+     '../../third_party/aom/av1/common/arm/highbd_convolve_scale_neon.c',
+     '../../third_party/aom/av1/common/arm/highbd_inv_txfm_neon.c',
+     '../../third_party/aom/av1/common/arm/highbd_reconinter_neon.c',
+     '../../third_party/aom/av1/common/arm/highbd_reconintra_neon.c',
+     '../../third_party/aom/av1/common/arm/highbd_warp_plane_neon.c',
+     '../../third_party/aom/av1/common/arm/highbd_wiener_convolve_neon.c',
+     '../../third_party/aom/av1/common/arm/reconinter_neon.c',
+     '../../third_party/aom/av1/common/arm/reconintra_neon.c',
+     '../../third_party/aom/av1/common/arm/resize_neon.c',
+     '../../third_party/aom/av1/common/arm/selfguided_neon.c',
+     '../../third_party/aom/av1/common/arm/warp_plane_neon.c',
+     '../../third_party/aom/av1/common/arm/warp_plane_neon_i8mm.c',
+     '../../third_party/aom/av1/common/arm/wiener_convolve_neon.c',
+     '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
+     '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
+     '../../third_party/aom/av1/common/av1_loopfilter.c',
+     '../../third_party/aom/av1/common/av1_rtcd.c',
+     '../../third_party/aom/av1/common/av1_txfm.c',
+     '../../third_party/aom/av1/common/blockd.c',
+     '../../third_party/aom/av1/common/cdef.c',
+     '../../third_party/aom/av1/common/cdef_block.c',
+     '../../third_party/aom/av1/common/cfl.c',
+     '../../third_party/aom/av1/common/common_data.c',
+     '../../third_party/aom/av1/common/convolve.c',
+     '../../third_party/aom/av1/common/debugmodes.c',
+     '../../third_party/aom/av1/common/entropy.c',
+     '../../third_party/aom/av1/common/entropymode.c',
+     '../../third_party/aom/av1/common/entropymv.c',
+     '../../third_party/aom/av1/common/frame_buffers.c',
+     '../../third_party/aom/av1/common/idct.c',
+     '../../third_party/aom/av1/common/mvref_common.c',
+     '../../third_party/aom/av1/common/obu_util.c',
+     '../../third_party/aom/av1/common/pred_common.c',
+     '../../third_party/aom/av1/common/quant_common.c',
+     '../../third_party/aom/av1/common/reconinter.c',
+     '../../third_party/aom/av1/common/reconintra.c',
+     '../../third_party/aom/av1/common/resize.c',
+     '../../third_party/aom/av1/common/restoration.c',
+     '../../third_party/aom/av1/common/scale.c',
+     '../../third_party/aom/av1/common/scan.c',
+     '../../third_party/aom/av1/common/seg_common.c',
+     '../../third_party/aom/av1/common/thread_common.c',
+     '../../third_party/aom/av1/common/tile_common.c',
+     '../../third_party/aom/av1/common/timing.c',
+     '../../third_party/aom/av1/common/txb_common.c',
+     '../../third_party/aom/av1/common/warped_motion.c',
+     '../../third_party/aom/av1/decoder/decodeframe.c',
+     '../../third_party/aom/av1/decoder/decodemv.c',
+     '../../third_party/aom/av1/decoder/decoder.c',
+     '../../third_party/aom/av1/decoder/decodetxb.c',
+     '../../third_party/aom/av1/decoder/detokenize.c',
+     '../../third_party/aom/av1/decoder/grain_synthesis.c',
+     '../../third_party/aom/av1/decoder/obu.c',
+     '../../third_party/aom/av1/encoder/allintra_vis.c',
+     '../../third_party/aom/av1/encoder/aq_complexity.c',
+     '../../third_party/aom/av1/encoder/aq_cyclicrefresh.c',
+     '../../third_party/aom/av1/encoder/aq_variance.c',
+     '../../third_party/aom/av1/encoder/arm/av1_error_neon.c',
+     '../../third_party/aom/av1/encoder/arm/av1_fwd_txfm2d_neon.c',
+     '../../third_party/aom/av1/encoder/arm/av1_highbd_quantize_neon.c',
+     '../../third_party/aom/av1/encoder/arm/av1_k_means_neon.c',
+     '../../third_party/aom/av1/encoder/arm/cnn_neon.c',
+     '../../third_party/aom/av1/encoder/arm/encodetxb_neon.c',
+     '../../third_party/aom/av1/encoder/arm/hash_arm_crc32.c',
+     '../../third_party/aom/av1/encoder/arm/highbd_fwd_txfm_neon.c',
+     '../../third_party/aom/av1/encoder/arm/highbd_pickrst_neon.c',
+     '../../third_party/aom/av1/encoder/arm/highbd_rdopt_neon.c',
+     '../../third_party/aom/av1/encoder/arm/highbd_temporal_filter_neon.c',
+     '../../third_party/aom/av1/encoder/arm/hybrid_fwd_txfm_neon.c',
+     '../../third_party/aom/av1/encoder/arm/ml_neon.c',
+     '../../third_party/aom/av1/encoder/arm/pickrst_neon.c',
+     '../../third_party/aom/av1/encoder/arm/quantize_neon.c',
+     '../../third_party/aom/av1/encoder/arm/rdopt_neon.c',
+     '../../third_party/aom/av1/encoder/arm/reconinter_enc_neon.c',
+     '../../third_party/aom/av1/encoder/arm/temporal_filter_neon.c',
+     '../../third_party/aom/av1/encoder/arm/temporal_filter_neon_dotprod.c',
+     '../../third_party/aom/av1/encoder/arm/wedge_utils_neon.c',
+     '../../third_party/aom/av1/encoder/av1_fwd_txfm1d.c',
+     '../../third_party/aom/av1/encoder/av1_fwd_txfm2d.c',
+     '../../third_party/aom/av1/encoder/av1_noise_estimate.c',
+     '../../third_party/aom/av1/encoder/av1_quantize.c',
+     '../../third_party/aom/av1/encoder/bitstream.c',
+     '../../third_party/aom/av1/encoder/cnn.c',
+     '../../third_party/aom/av1/encoder/compound_type.c',
+     '../../third_party/aom/av1/encoder/context_tree.c',
+     '../../third_party/aom/av1/encoder/cost.c',
+     '../../third_party/aom/av1/encoder/dwt.c',
+     '../../third_party/aom/av1/encoder/encode_strategy.c',
+     '../../third_party/aom/av1/encoder/encodeframe.c',
+     '../../third_party/aom/av1/encoder/encodeframe_utils.c',
+     '../../third_party/aom/av1/encoder/encodemb.c',
+     '../../third_party/aom/av1/encoder/encodemv.c',
+     '../../third_party/aom/av1/encoder/encoder.c',
+     '../../third_party/aom/av1/encoder/encoder_utils.c',
+     '../../third_party/aom/av1/encoder/encodetxb.c',
+     '../../third_party/aom/av1/encoder/ethread.c',
+     '../../third_party/aom/av1/encoder/extend.c',
+     '../../third_party/aom/av1/encoder/external_partition.c',
+     '../../third_party/aom/av1/encoder/firstpass.c',
+     '../../third_party/aom/av1/encoder/global_motion.c',
+     '../../third_party/aom/av1/encoder/global_motion_facade.c',
+     '../../third_party/aom/av1/encoder/gop_structure.c',
+     '../../third_party/aom/av1/encoder/hash.c',
+     '../../third_party/aom/av1/encoder/hash_motion.c',
+     '../../third_party/aom/av1/encoder/hybrid_fwd_txfm.c',
+     '../../third_party/aom/av1/encoder/interp_search.c',
+     '../../third_party/aom/av1/encoder/intra_mode_search.c',
+     '../../third_party/aom/av1/encoder/level.c',
+     '../../third_party/aom/av1/encoder/lookahead.c',
+     '../../third_party/aom/av1/encoder/mcomp.c',
+     '../../third_party/aom/av1/encoder/ml.c',
+     '../../third_party/aom/av1/encoder/motion_search_facade.c',
+     '../../third_party/aom/av1/encoder/mv_prec.c',
+     '../../third_party/aom/av1/encoder/nonrd_opt.c',
+     '../../third_party/aom/av1/encoder/nonrd_pickmode.c',
+     '../../third_party/aom/av1/encoder/palette.c',
+     '../../third_party/aom/av1/encoder/partition_search.c',
+     '../../third_party/aom/av1/encoder/partition_strategy.c',
+     '../../third_party/aom/av1/encoder/pass2_strategy.c',
+     '../../third_party/aom/av1/encoder/pickcdef.c',
+     '../../third_party/aom/av1/encoder/picklpf.c',
+     '../../third_party/aom/av1/encoder/pickrst.c',
+     '../../third_party/aom/av1/encoder/ratectrl.c',
+     '../../third_party/aom/av1/encoder/rd.c',
+     '../../third_party/aom/av1/encoder/rdopt.c',
+     '../../third_party/aom/av1/encoder/reconinter_enc.c',
+     '../../third_party/aom/av1/encoder/segmentation.c',
+     '../../third_party/aom/av1/encoder/speed_features.c',
+     '../../third_party/aom/av1/encoder/superres_scale.c',
+     '../../third_party/aom/av1/encoder/svc_layercontext.c',
+     '../../third_party/aom/av1/encoder/temporal_filter.c',
+     '../../third_party/aom/av1/encoder/thirdpass.c',
+     '../../third_party/aom/av1/encoder/tokenize.c',
+     '../../third_party/aom/av1/encoder/tpl_model.c',
+     '../../third_party/aom/av1/encoder/tx_search.c',
+     '../../third_party/aom/av1/encoder/txb_rdopt.c',
+     '../../third_party/aom/av1/encoder/var_based_part.c',
+     '../../third_party/aom/av1/encoder/wedge_utils.c',
+     '../../third_party/aom/av1/ratectrl_rtc.cc',
+     '../../third_party/aom/common/args_helper.c',
+     '../../third_party/aom/third_party/fastfeat/fast.c',
+     '../../third_party/aom/third_party/fastfeat/fast_9.c',
+     '../../third_party/aom/third_party/fastfeat/nonmax.c',
+     '../../third_party/aom/third_party/vector/vector.c',
+   ],
    'GENERIC_EXPORTS': [
      '../../third_party/aom/aom/aom.h',
      '../../third_party/aom/aom/aom_codec.h',

diff --cc media/libvpx/sources.mozbuild
index 55f84b7e863ceda822c2739d6ed344b02c72e35b,12c20ede9f3a69599a40f34484935ad1c4b3fcf0..77fd770abfe23f86f8d9fe3a2d619e07c24e0315
--- 1/media/libvpx/sources.mozbuild
--- 2/media/libvpx/sources.mozbuild
+++ b/media/libvpx/sources.mozbuild
@@@ -531,7 -545,1852 +545,1601 @@@ files = 
      'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm',
      'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm',
      'libvpx/vpx_mem/vpx_mem.c',
-     'libvpx/vpx_ports/emms_mmx.c',
+     'libvpx/vpx_ports/emms_mmx.asm',
+     'libvpx/vpx_ports/float_control_word.asm',
+     'libvpx/vpx_scale/generic/gen_scalers.c',
+     'libvpx/vpx_scale/generic/vpx_scale.c',
+     'libvpx/vpx_scale/generic/yv12config.c',
+     'libvpx/vpx_scale/generic/yv12extend.c',
+     'libvpx/vpx_scale/vpx_scale_rtcd.c',
+     'libvpx/vpx_util/vpx_thread.c',
+     'libvpx/vpx_util/vpx_write_yuv_frame.c',
+ ],
+   'WIN_X64_EXPORTS': [
+     'libvpx/vpx/vp8.h',
+     'libvpx/vpx/vp8cx.h',
+     'libvpx/vpx/vp8dx.h',
+     'libvpx/vpx/vpx_codec.h',
+     'libvpx/vpx/vpx_decoder.h',
+     'libvpx/vpx/vpx_encoder.h',
+     'libvpx/vpx/vpx_ext_ratectrl.h',
+     'libvpx/vpx/vpx_frame_buffer.h',
+     'libvpx/vpx/vpx_image.h',
+     'libvpx/vpx/vpx_integer.h',
+     'libvpx/vpx/vpx_tpl.h',
+     'libvpx/vpx_mem/include/vpx_mem_intrnl.h',
+     'libvpx/vpx_mem/vpx_mem.h',
+     'libvpx/vpx_ports/bitops.h',
+     'libvpx/vpx_ports/compiler_attributes.h',
+     'libvpx/vpx_ports/mem.h',
+     'libvpx/vpx_ports/static_assert.h',
+     'libvpx/vpx_ports/system_state.h',
+     'libvpx/vpx_ports/vpx_timer.h',
+     'libvpx/vpx_ports/x86.h',
+     'libvpx/vpx_scale/vpx_scale.h',
+     'libvpx/vpx_scale/yv12config.h',
+ ],
+   'WIN_X64_SOURCES': [
+     'libvpx/../config/win/x64/vpx_config.c',
+     'libvpx/vp8/common/alloccommon.c',
+     'libvpx/vp8/common/blockd.c',
+     'libvpx/vp8/common/dequantize.c',
+     'libvpx/vp8/common/entropy.c',
+     'libvpx/vp8/common/entropymode.c',
+     'libvpx/vp8/common/entropymv.c',
+     'libvpx/vp8/common/extend.c',
+     'libvpx/vp8/common/filter.c',
+     'libvpx/vp8/common/findnearmv.c',
+     'libvpx/vp8/common/generic/systemdependent.c',
+     'libvpx/vp8/common/idct_blk.c',
+     'libvpx/vp8/common/idctllm.c',
+     'libvpx/vp8/common/loopfilter_filters.c',
+     'libvpx/vp8/common/mbpitch.c',
+     'libvpx/vp8/common/mfqe.c',
+     'libvpx/vp8/common/modecont.c',
+     'libvpx/vp8/common/postproc.c',
+     'libvpx/vp8/common/quant_common.c',
+     'libvpx/vp8/common/reconinter.c',
+     'libvpx/vp8/common/reconintra.c',
+     'libvpx/vp8/common/reconintra4x4.c',
+     'libvpx/vp8/common/rtcd.c',
+     'libvpx/vp8/common/setupintrarecon.c',
+     'libvpx/vp8/common/swapyv12buffer.c',
+     'libvpx/vp8/common/treecoder.c',
+     'libvpx/vp8/common/vp8_loopfilter.c',
+     'libvpx/vp8/common/vp8_skin_detection.c',
+     'libvpx/vp8/common/x86/bilinear_filter_sse2.c',
+     'libvpx/vp8/common/x86/dequantize_mmx.asm',
+     'libvpx/vp8/common/x86/idct_blk_mmx.c',
+     'libvpx/vp8/common/x86/idct_blk_sse2.c',
+     'libvpx/vp8/common/x86/idctllm_mmx.asm',
+     'libvpx/vp8/common/x86/idctllm_sse2.asm',
+     'libvpx/vp8/common/x86/iwalsh_sse2.asm',
+     'libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm',
+     'libvpx/vp8/common/x86/loopfilter_sse2.asm',
+     'libvpx/vp8/common/x86/loopfilter_x86.c',
+     'libvpx/vp8/common/x86/mfqe_sse2.asm',
+     'libvpx/vp8/common/x86/recon_mmx.asm',
+     'libvpx/vp8/common/x86/recon_sse2.asm',
+     'libvpx/vp8/common/x86/subpixel_mmx.asm',
+     'libvpx/vp8/common/x86/subpixel_sse2.asm',
+     'libvpx/vp8/common/x86/subpixel_ssse3.asm',
+     'libvpx/vp8/common/x86/vp8_asm_stubs.c',
+     'libvpx/vp8/decoder/dboolhuff.c',
+     'libvpx/vp8/decoder/decodeframe.c',
+     'libvpx/vp8/decoder/decodemv.c',
+     'libvpx/vp8/decoder/detokenize.c',
+     'libvpx/vp8/decoder/onyxd_if.c',
+     'libvpx/vp8/decoder/threading.c',
+     'libvpx/vp8/encoder/bitstream.c',
+     'libvpx/vp8/encoder/boolhuff.c',
+     'libvpx/vp8/encoder/copy_c.c',
+     'libvpx/vp8/encoder/dct.c',
+     'libvpx/vp8/encoder/denoising.c',
+     'libvpx/vp8/encoder/encodeframe.c',
+     'libvpx/vp8/encoder/encodeintra.c',
+     'libvpx/vp8/encoder/encodemb.c',
+     'libvpx/vp8/encoder/encodemv.c',
+     'libvpx/vp8/encoder/ethreading.c',
+     'libvpx/vp8/encoder/firstpass.c',
+     'libvpx/vp8/encoder/lookahead.c',
+     'libvpx/vp8/encoder/mcomp.c',
+     'libvpx/vp8/encoder/modecosts.c',
+     'libvpx/vp8/encoder/mr_dissim.c',
+     'libvpx/vp8/encoder/onyx_if.c',
+     'libvpx/vp8/encoder/pickinter.c',
+     'libvpx/vp8/encoder/picklpf.c',
+     'libvpx/vp8/encoder/ratectrl.c',
+     'libvpx/vp8/encoder/rdopt.c',
+     'libvpx/vp8/encoder/segmentation.c',
+     'libvpx/vp8/encoder/temporal_filter.c',
+     'libvpx/vp8/encoder/tokenize.c',
+     'libvpx/vp8/encoder/treewriter.c',
+     'libvpx/vp8/encoder/vp8_quantize.c',
+     'libvpx/vp8/encoder/x86/block_error_sse2.asm',
+     'libvpx/vp8/encoder/x86/copy_sse2.asm',
+     'libvpx/vp8/encoder/x86/copy_sse3.asm',
+     'libvpx/vp8/encoder/x86/dct_sse2.asm',
+     'libvpx/vp8/encoder/x86/denoising_sse2.c',
+     'libvpx/vp8/encoder/x86/fwalsh_sse2.asm',
+     'libvpx/vp8/encoder/x86/quantize_sse4.c',
+     'libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm',
+     'libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
+     'libvpx/vp8/encoder/x86/vp8_quantize_sse2.c',
+     'libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c',
+     'libvpx/vp8/vp8_cx_iface.c',
+     'libvpx/vp8/vp8_dx_iface.c',
+     'libvpx/vp9/common/vp9_alloccommon.c',
+     'libvpx/vp9/common/vp9_blockd.c',
+     'libvpx/vp9/common/vp9_common_data.c',
+     'libvpx/vp9/common/vp9_entropy.c',
+     'libvpx/vp9/common/vp9_entropymode.c',
+     'libvpx/vp9/common/vp9_entropymv.c',
+     'libvpx/vp9/common/vp9_filter.c',
+     'libvpx/vp9/common/vp9_frame_buffers.c',
+     'libvpx/vp9/common/vp9_idct.c',
+     'libvpx/vp9/common/vp9_loopfilter.c',
+     'libvpx/vp9/common/vp9_mfqe.c',
+     'libvpx/vp9/common/vp9_mvref_common.c',
+     'libvpx/vp9/common/vp9_postproc.c',
+     'libvpx/vp9/common/vp9_pred_common.c',
+     'libvpx/vp9/common/vp9_quant_common.c',
+     'libvpx/vp9/common/vp9_reconinter.c',
+     'libvpx/vp9/common/vp9_reconintra.c',
+     'libvpx/vp9/common/vp9_rtcd.c',
+     'libvpx/vp9/common/vp9_scale.c',
+     'libvpx/vp9/common/vp9_scan.c',
+     'libvpx/vp9/common/vp9_seg_common.c',
+     'libvpx/vp9/common/vp9_thread_common.c',
+     'libvpx/vp9/common/vp9_tile_common.c',
+     'libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c',
+     'libvpx/vp9/common/x86/vp9_mfqe_sse2.asm',
+     'libvpx/vp9/decoder/vp9_decodeframe.c',
+     'libvpx/vp9/decoder/vp9_decodemv.c',
+     'libvpx/vp9/decoder/vp9_decoder.c',
+     'libvpx/vp9/decoder/vp9_detokenize.c',
+     'libvpx/vp9/decoder/vp9_dsubexp.c',
+     'libvpx/vp9/decoder/vp9_job_queue.c',
+     'libvpx/vp9/encoder/vp9_alt_ref_aq.c',
+     'libvpx/vp9/encoder/vp9_aq_360.c',
+     'libvpx/vp9/encoder/vp9_aq_complexity.c',
+     'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c',
+     'libvpx/vp9/encoder/vp9_aq_variance.c',
+     'libvpx/vp9/encoder/vp9_bitstream.c',
+     'libvpx/vp9/encoder/vp9_context_tree.c',
+     'libvpx/vp9/encoder/vp9_cost.c',
+     'libvpx/vp9/encoder/vp9_dct.c',
+     'libvpx/vp9/encoder/vp9_encodeframe.c',
+     'libvpx/vp9/encoder/vp9_encodemb.c',
+     'libvpx/vp9/encoder/vp9_encodemv.c',
+     'libvpx/vp9/encoder/vp9_encoder.c',
+     'libvpx/vp9/encoder/vp9_ethread.c',
+     'libvpx/vp9/encoder/vp9_ext_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_extend.c',
+     'libvpx/vp9/encoder/vp9_firstpass.c',
+     'libvpx/vp9/encoder/vp9_frame_scale.c',
+     'libvpx/vp9/encoder/vp9_lookahead.c',
+     'libvpx/vp9/encoder/vp9_mbgraph.c',
+     'libvpx/vp9/encoder/vp9_mcomp.c',
+     'libvpx/vp9/encoder/vp9_multi_thread.c',
+     'libvpx/vp9/encoder/vp9_noise_estimate.c',
+     'libvpx/vp9/encoder/vp9_picklpf.c',
+     'libvpx/vp9/encoder/vp9_pickmode.c',
+     'libvpx/vp9/encoder/vp9_quantize.c',
+     'libvpx/vp9/encoder/vp9_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_rd.c',
+     'libvpx/vp9/encoder/vp9_rdopt.c',
+     'libvpx/vp9/encoder/vp9_resize.c',
+     'libvpx/vp9/encoder/vp9_segmentation.c',
+     'libvpx/vp9/encoder/vp9_skin_detection.c',
+     'libvpx/vp9/encoder/vp9_speed_features.c',
+     'libvpx/vp9/encoder/vp9_subexp.c',
+     'libvpx/vp9/encoder/vp9_svc_layercontext.c',
+     'libvpx/vp9/encoder/vp9_temporal_filter.c',
+     'libvpx/vp9/encoder/vp9_tokenize.c',
+     'libvpx/vp9/encoder/vp9_tpl_model.c',
+     'libvpx/vp9/encoder/vp9_treewriter.c',
+     'libvpx/vp9/encoder/x86/temporal_filter_sse4.c',
+     'libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c',
+     'libvpx/vp9/encoder/x86/vp9_dct_sse2.asm',
+     'libvpx/vp9/encoder/x86/vp9_error_avx2.c',
+     'libvpx/vp9/encoder/x86/vp9_error_sse2.asm',
+     'libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_avx2.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_sse2.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c',
+     'libvpx/vp9/vp9_cx_iface.c',
+     'libvpx/vp9/vp9_dx_iface.c',
+     'libvpx/vp9/vp9_iface_common.c',
+     'libvpx/vpx/src/vpx_codec.c',
+     'libvpx/vpx/src/vpx_decoder.c',
+     'libvpx/vpx/src/vpx_encoder.c',
+     'libvpx/vpx/src/vpx_image.c',
+     'libvpx/vpx_dsp/add_noise.c',
+     'libvpx/vpx_dsp/avg.c',
+     'libvpx/vpx_dsp/bitreader.c',
+     'libvpx/vpx_dsp/bitreader_buffer.c',
+     'libvpx/vpx_dsp/bitwriter.c',
+     'libvpx/vpx_dsp/bitwriter_buffer.c',
+     'libvpx/vpx_dsp/deblock.c',
+     'libvpx/vpx_dsp/fwd_txfm.c',
+     'libvpx/vpx_dsp/intrapred.c',
+     'libvpx/vpx_dsp/inv_txfm.c',
+     'libvpx/vpx_dsp/loopfilter.c',
+     'libvpx/vpx_dsp/prob.c',
+     'libvpx/vpx_dsp/psnr.c',
+     'libvpx/vpx_dsp/quantize.c',
+     'libvpx/vpx_dsp/sad.c',
+     'libvpx/vpx_dsp/skin_detection.c',
+     'libvpx/vpx_dsp/sse.c',
+     'libvpx/vpx_dsp/subtract.c',
+     'libvpx/vpx_dsp/sum_squares.c',
+     'libvpx/vpx_dsp/variance.c',
+     'libvpx/vpx_dsp/vpx_convolve.c',
+     'libvpx/vpx_dsp/vpx_dsp_rtcd.c',
+     'libvpx/vpx_dsp/x86/add_noise_sse2.asm',
+     'libvpx/vpx_dsp/x86/avg_intrin_avx2.c',
+     'libvpx/vpx_dsp/x86/avg_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/avg_pred_avx2.c',
+     'libvpx/vpx_dsp/x86/avg_pred_sse2.c',
+     'libvpx/vpx_dsp/x86/avg_ssse3_x86_64.asm',
+     'libvpx/vpx_dsp/x86/deblock_sse2.asm',
+     'libvpx/vpx_dsp/x86/fwd_txfm_avx2.c',
+     'libvpx/vpx_dsp/x86/fwd_txfm_sse2.c',
+     'libvpx/vpx_dsp/x86/fwd_txfm_ssse3_x86_64.asm',
+     'libvpx/vpx_dsp/x86/intrapred_sse2.asm',
+     'libvpx/vpx_dsp/x86/intrapred_ssse3.asm',
+     'libvpx/vpx_dsp/x86/inv_txfm_avx2.c',
+     'libvpx/vpx_dsp/x86/inv_txfm_sse2.c',
+     'libvpx/vpx_dsp/x86/inv_txfm_ssse3.c',
+     'libvpx/vpx_dsp/x86/inv_wht_sse2.asm',
+     'libvpx/vpx_dsp/x86/loopfilter_avx2.c',
+     'libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/post_proc_sse2.c',
+     'libvpx/vpx_dsp/x86/quantize_avx.c',
+     'libvpx/vpx_dsp/x86/quantize_avx2.c',
+     'libvpx/vpx_dsp/x86/quantize_sse2.c',
+     'libvpx/vpx_dsp/x86/quantize_ssse3.c',
+     'libvpx/vpx_dsp/x86/sad4d_avx2.c',
+     'libvpx/vpx_dsp/x86/sad4d_sse2.asm',
+     'libvpx/vpx_dsp/x86/sad_avx2.c',
+     'libvpx/vpx_dsp/x86/sad_sse2.asm',
+     'libvpx/vpx_dsp/x86/sse_avx2.c',
+     'libvpx/vpx_dsp/x86/sse_sse4.c',
+     'libvpx/vpx_dsp/x86/ssim_opt_x86_64.asm',
+     'libvpx/vpx_dsp/x86/subpel_variance_sse2.asm',
+     'libvpx/vpx_dsp/x86/subtract_avx2.c',
+     'libvpx/vpx_dsp/x86/subtract_sse2.asm',
+     'libvpx/vpx_dsp/x86/sum_squares_sse2.c',
+     'libvpx/vpx_dsp/x86/variance_avx2.c',
+     'libvpx/vpx_dsp/x86/variance_sse2.c',
+     'libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm',
+     'libvpx/vpx_mem/vpx_mem.c',
+     'libvpx/vpx_ports/emms_mmx.asm',
+     'libvpx/vpx_ports/float_control_word.asm',
+     'libvpx/vpx_scale/generic/gen_scalers.c',
+     'libvpx/vpx_scale/generic/vpx_scale.c',
+     'libvpx/vpx_scale/generic/yv12config.c',
+     'libvpx/vpx_scale/generic/yv12extend.c',
+     'libvpx/vpx_scale/vpx_scale_rtcd.c',
+     'libvpx/vpx_util/vpx_thread.c',
+     'libvpx/vpx_util/vpx_write_yuv_frame.c',
+ ],
+   'LINUX_IA32_EXPORTS': [
+     'libvpx/vpx/vp8.h',
+     'libvpx/vpx/vp8cx.h',
+     'libvpx/vpx/vp8dx.h',
+     'libvpx/vpx/vpx_codec.h',
+     'libvpx/vpx/vpx_decoder.h',
+     'libvpx/vpx/vpx_encoder.h',
+     'libvpx/vpx/vpx_ext_ratectrl.h',
+     'libvpx/vpx/vpx_frame_buffer.h',
+     'libvpx/vpx/vpx_image.h',
+     'libvpx/vpx/vpx_integer.h',
+     'libvpx/vpx/vpx_tpl.h',
+     'libvpx/vpx_mem/include/vpx_mem_intrnl.h',
+     'libvpx/vpx_mem/vpx_mem.h',
+     'libvpx/vpx_ports/bitops.h',
+     'libvpx/vpx_ports/compiler_attributes.h',
+     'libvpx/vpx_ports/mem.h',
+     'libvpx/vpx_ports/static_assert.h',
+     'libvpx/vpx_ports/system_state.h',
+     'libvpx/vpx_ports/vpx_timer.h',
+     'libvpx/vpx_ports/x86.h',
+     'libvpx/vpx_scale/vpx_scale.h',
+     'libvpx/vpx_scale/yv12config.h',
+ ],
+   'LINUX_IA32_SOURCES': [
+     'libvpx/../config/linux/ia32/vpx_config.c',
+     'libvpx/vp8/common/alloccommon.c',
+     'libvpx/vp8/common/blockd.c',
+     'libvpx/vp8/common/dequantize.c',
+     'libvpx/vp8/common/entropy.c',
+     'libvpx/vp8/common/entropymode.c',
+     'libvpx/vp8/common/entropymv.c',
+     'libvpx/vp8/common/extend.c',
+     'libvpx/vp8/common/filter.c',
+     'libvpx/vp8/common/findnearmv.c',
+     'libvpx/vp8/common/generic/systemdependent.c',
+     'libvpx/vp8/common/idct_blk.c',
+     'libvpx/vp8/common/idctllm.c',
+     'libvpx/vp8/common/loopfilter_filters.c',
+     'libvpx/vp8/common/mbpitch.c',
+     'libvpx/vp8/common/mfqe.c',
+     'libvpx/vp8/common/modecont.c',
+     'libvpx/vp8/common/postproc.c',
+     'libvpx/vp8/common/quant_common.c',
+     'libvpx/vp8/common/reconinter.c',
+     'libvpx/vp8/common/reconintra.c',
+     'libvpx/vp8/common/reconintra4x4.c',
+     'libvpx/vp8/common/rtcd.c',
+     'libvpx/vp8/common/setupintrarecon.c',
+     'libvpx/vp8/common/swapyv12buffer.c',
+     'libvpx/vp8/common/treecoder.c',
+     'libvpx/vp8/common/vp8_loopfilter.c',
+     'libvpx/vp8/common/vp8_skin_detection.c',
+     'libvpx/vp8/common/x86/bilinear_filter_sse2.c',
+     'libvpx/vp8/common/x86/dequantize_mmx.asm',
+     'libvpx/vp8/common/x86/idct_blk_mmx.c',
+     'libvpx/vp8/common/x86/idct_blk_sse2.c',
+     'libvpx/vp8/common/x86/idctllm_mmx.asm',
+     'libvpx/vp8/common/x86/idctllm_sse2.asm',
+     'libvpx/vp8/common/x86/iwalsh_sse2.asm',
+     'libvpx/vp8/common/x86/loopfilter_sse2.asm',
+     'libvpx/vp8/common/x86/loopfilter_x86.c',
+     'libvpx/vp8/common/x86/mfqe_sse2.asm',
+     'libvpx/vp8/common/x86/recon_mmx.asm',
+     'libvpx/vp8/common/x86/recon_sse2.asm',
+     'libvpx/vp8/common/x86/subpixel_mmx.asm',
+     'libvpx/vp8/common/x86/subpixel_sse2.asm',
+     'libvpx/vp8/common/x86/subpixel_ssse3.asm',
+     'libvpx/vp8/common/x86/vp8_asm_stubs.c',
+     'libvpx/vp8/decoder/dboolhuff.c',
+     'libvpx/vp8/decoder/decodeframe.c',
+     'libvpx/vp8/decoder/decodemv.c',
+     'libvpx/vp8/decoder/detokenize.c',
+     'libvpx/vp8/decoder/onyxd_if.c',
+     'libvpx/vp8/decoder/threading.c',
+     'libvpx/vp8/encoder/bitstream.c',
+     'libvpx/vp8/encoder/boolhuff.c',
+     'libvpx/vp8/encoder/copy_c.c',
+     'libvpx/vp8/encoder/dct.c',
+     'libvpx/vp8/encoder/denoising.c',
+     'libvpx/vp8/encoder/encodeframe.c',
+     'libvpx/vp8/encoder/encodeintra.c',
+     'libvpx/vp8/encoder/encodemb.c',
+     'libvpx/vp8/encoder/encodemv.c',
+     'libvpx/vp8/encoder/ethreading.c',
+     'libvpx/vp8/encoder/firstpass.c',
+     'libvpx/vp8/encoder/lookahead.c',
+     'libvpx/vp8/encoder/mcomp.c',
+     'libvpx/vp8/encoder/modecosts.c',
+     'libvpx/vp8/encoder/mr_dissim.c',
+     'libvpx/vp8/encoder/onyx_if.c',
+     'libvpx/vp8/encoder/pickinter.c',
+     'libvpx/vp8/encoder/picklpf.c',
+     'libvpx/vp8/encoder/ratectrl.c',
+     'libvpx/vp8/encoder/rdopt.c',
+     'libvpx/vp8/encoder/segmentation.c',
+     'libvpx/vp8/encoder/temporal_filter.c',
+     'libvpx/vp8/encoder/tokenize.c',
+     'libvpx/vp8/encoder/treewriter.c',
+     'libvpx/vp8/encoder/vp8_quantize.c',
+     'libvpx/vp8/encoder/x86/block_error_sse2.asm',
+     'libvpx/vp8/encoder/x86/copy_sse2.asm',
+     'libvpx/vp8/encoder/x86/copy_sse3.asm',
+     'libvpx/vp8/encoder/x86/dct_sse2.asm',
+     'libvpx/vp8/encoder/x86/denoising_sse2.c',
+     'libvpx/vp8/encoder/x86/fwalsh_sse2.asm',
+     'libvpx/vp8/encoder/x86/quantize_sse4.c',
+     'libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm',
+     'libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
+     'libvpx/vp8/encoder/x86/vp8_quantize_sse2.c',
+     'libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c',
+     'libvpx/vp8/vp8_cx_iface.c',
+     'libvpx/vp8/vp8_dx_iface.c',
+     'libvpx/vp9/common/vp9_alloccommon.c',
+     'libvpx/vp9/common/vp9_blockd.c',
+     'libvpx/vp9/common/vp9_common_data.c',
+     'libvpx/vp9/common/vp9_entropy.c',
+     'libvpx/vp9/common/vp9_entropymode.c',
+     'libvpx/vp9/common/vp9_entropymv.c',
+     'libvpx/vp9/common/vp9_filter.c',
+     'libvpx/vp9/common/vp9_frame_buffers.c',
+     'libvpx/vp9/common/vp9_idct.c',
+     'libvpx/vp9/common/vp9_loopfilter.c',
+     'libvpx/vp9/common/vp9_mfqe.c',
+     'libvpx/vp9/common/vp9_mvref_common.c',
+     'libvpx/vp9/common/vp9_postproc.c',
+     'libvpx/vp9/common/vp9_pred_common.c',
+     'libvpx/vp9/common/vp9_quant_common.c',
+     'libvpx/vp9/common/vp9_reconinter.c',
+     'libvpx/vp9/common/vp9_reconintra.c',
+     'libvpx/vp9/common/vp9_rtcd.c',
+     'libvpx/vp9/common/vp9_scale.c',
+     'libvpx/vp9/common/vp9_scan.c',
+     'libvpx/vp9/common/vp9_seg_common.c',
+     'libvpx/vp9/common/vp9_thread_common.c',
+     'libvpx/vp9/common/vp9_tile_common.c',
+     'libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c',
+     'libvpx/vp9/common/x86/vp9_mfqe_sse2.asm',
+     'libvpx/vp9/decoder/vp9_decodeframe.c',
+     'libvpx/vp9/decoder/vp9_decodemv.c',
+     'libvpx/vp9/decoder/vp9_decoder.c',
+     'libvpx/vp9/decoder/vp9_detokenize.c',
+     'libvpx/vp9/decoder/vp9_dsubexp.c',
+     'libvpx/vp9/decoder/vp9_job_queue.c',
+     'libvpx/vp9/encoder/vp9_alt_ref_aq.c',
+     'libvpx/vp9/encoder/vp9_aq_360.c',
+     'libvpx/vp9/encoder/vp9_aq_complexity.c',
+     'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c',
+     'libvpx/vp9/encoder/vp9_aq_variance.c',
+     'libvpx/vp9/encoder/vp9_bitstream.c',
+     'libvpx/vp9/encoder/vp9_context_tree.c',
+     'libvpx/vp9/encoder/vp9_cost.c',
+     'libvpx/vp9/encoder/vp9_dct.c',
+     'libvpx/vp9/encoder/vp9_encodeframe.c',
+     'libvpx/vp9/encoder/vp9_encodemb.c',
+     'libvpx/vp9/encoder/vp9_encodemv.c',
+     'libvpx/vp9/encoder/vp9_encoder.c',
+     'libvpx/vp9/encoder/vp9_ethread.c',
+     'libvpx/vp9/encoder/vp9_ext_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_extend.c',
+     'libvpx/vp9/encoder/vp9_firstpass.c',
+     'libvpx/vp9/encoder/vp9_frame_scale.c',
+     'libvpx/vp9/encoder/vp9_lookahead.c',
+     'libvpx/vp9/encoder/vp9_mbgraph.c',
+     'libvpx/vp9/encoder/vp9_mcomp.c',
+     'libvpx/vp9/encoder/vp9_multi_thread.c',
+     'libvpx/vp9/encoder/vp9_noise_estimate.c',
+     'libvpx/vp9/encoder/vp9_picklpf.c',
+     'libvpx/vp9/encoder/vp9_pickmode.c',
+     'libvpx/vp9/encoder/vp9_quantize.c',
+     'libvpx/vp9/encoder/vp9_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_rd.c',
+     'libvpx/vp9/encoder/vp9_rdopt.c',
+     'libvpx/vp9/encoder/vp9_resize.c',
+     'libvpx/vp9/encoder/vp9_segmentation.c',
+     'libvpx/vp9/encoder/vp9_skin_detection.c',
+     'libvpx/vp9/encoder/vp9_speed_features.c',
+     'libvpx/vp9/encoder/vp9_subexp.c',
+     'libvpx/vp9/encoder/vp9_svc_layercontext.c',
+     'libvpx/vp9/encoder/vp9_temporal_filter.c',
+     'libvpx/vp9/encoder/vp9_tokenize.c',
+     'libvpx/vp9/encoder/vp9_tpl_model.c',
+     'libvpx/vp9/encoder/vp9_treewriter.c',
+     'libvpx/vp9/encoder/x86/temporal_filter_sse4.c',
+     'libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c',
+     'libvpx/vp9/encoder/x86/vp9_dct_sse2.asm',
+     'libvpx/vp9/encoder/x86/vp9_error_avx2.c',
+     'libvpx/vp9/encoder/x86/vp9_error_sse2.asm',
+     'libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_avx2.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_sse2.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c',
+     'libvpx/vp9/vp9_cx_iface.c',
+     'libvpx/vp9/vp9_dx_iface.c',
+     'libvpx/vp9/vp9_iface_common.c',
+     'libvpx/vpx/src/vpx_codec.c',
+     'libvpx/vpx/src/vpx_decoder.c',
+     'libvpx/vpx/src/vpx_encoder.c',
+     'libvpx/vpx/src/vpx_image.c',
+     'libvpx/vpx_dsp/add_noise.c',
+     'libvpx/vpx_dsp/avg.c',
+     'libvpx/vpx_dsp/bitreader.c',
+     'libvpx/vpx_dsp/bitreader_buffer.c',
+     'libvpx/vpx_dsp/bitwriter.c',
+     'libvpx/vpx_dsp/bitwriter_buffer.c',
+     'libvpx/vpx_dsp/deblock.c',
+     'libvpx/vpx_dsp/fwd_txfm.c',
+     'libvpx/vpx_dsp/intrapred.c',
+     'libvpx/vpx_dsp/inv_txfm.c',
+     'libvpx/vpx_dsp/loopfilter.c',
+     'libvpx/vpx_dsp/prob.c',
+     'libvpx/vpx_dsp/psnr.c',
+     'libvpx/vpx_dsp/quantize.c',
+     'libvpx/vpx_dsp/sad.c',
+     'libvpx/vpx_dsp/skin_detection.c',
+     'libvpx/vpx_dsp/sse.c',
+     'libvpx/vpx_dsp/subtract.c',
+     'libvpx/vpx_dsp/sum_squares.c',
+     'libvpx/vpx_dsp/variance.c',
+     'libvpx/vpx_dsp/vpx_convolve.c',
+     'libvpx/vpx_dsp/vpx_dsp_rtcd.c',
+     'libvpx/vpx_dsp/x86/add_noise_sse2.asm',
+     'libvpx/vpx_dsp/x86/avg_intrin_avx2.c',
+     'libvpx/vpx_dsp/x86/avg_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/avg_pred_avx2.c',
+     'libvpx/vpx_dsp/x86/avg_pred_sse2.c',
+     'libvpx/vpx_dsp/x86/deblock_sse2.asm',
+     'libvpx/vpx_dsp/x86/fwd_txfm_avx2.c',
+     'libvpx/vpx_dsp/x86/fwd_txfm_sse2.c',
+     'libvpx/vpx_dsp/x86/intrapred_sse2.asm',
+     'libvpx/vpx_dsp/x86/intrapred_ssse3.asm',
+     'libvpx/vpx_dsp/x86/inv_txfm_avx2.c',
+     'libvpx/vpx_dsp/x86/inv_txfm_sse2.c',
+     'libvpx/vpx_dsp/x86/inv_txfm_ssse3.c',
+     'libvpx/vpx_dsp/x86/inv_wht_sse2.asm',
+     'libvpx/vpx_dsp/x86/loopfilter_avx2.c',
+     'libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/post_proc_sse2.c',
+     'libvpx/vpx_dsp/x86/quantize_avx.c',
+     'libvpx/vpx_dsp/x86/quantize_avx2.c',
+     'libvpx/vpx_dsp/x86/quantize_sse2.c',
+     'libvpx/vpx_dsp/x86/quantize_ssse3.c',
+     'libvpx/vpx_dsp/x86/sad4d_avx2.c',
+     'libvpx/vpx_dsp/x86/sad4d_sse2.asm',
+     'libvpx/vpx_dsp/x86/sad_avx2.c',
+     'libvpx/vpx_dsp/x86/sad_sse2.asm',
+     'libvpx/vpx_dsp/x86/sse_avx2.c',
+     'libvpx/vpx_dsp/x86/sse_sse4.c',
+     'libvpx/vpx_dsp/x86/subpel_variance_sse2.asm',
+     'libvpx/vpx_dsp/x86/subtract_avx2.c',
+     'libvpx/vpx_dsp/x86/subtract_sse2.asm',
+     'libvpx/vpx_dsp/x86/sum_squares_sse2.c',
+     'libvpx/vpx_dsp/x86/variance_avx2.c',
+     'libvpx/vpx_dsp/x86/variance_sse2.c',
+     'libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm',
+     'libvpx/vpx_mem/vpx_mem.c',
+     'libvpx/vpx_ports/emms_mmx.c',
+     'libvpx/vpx_scale/generic/gen_scalers.c',
+     'libvpx/vpx_scale/generic/vpx_scale.c',
+     'libvpx/vpx_scale/generic/yv12config.c',
+     'libvpx/vpx_scale/generic/yv12extend.c',
+     'libvpx/vpx_scale/vpx_scale_rtcd.c',
+     'libvpx/vpx_util/vpx_thread.c',
+     'libvpx/vpx_util/vpx_write_yuv_frame.c',
+ ],
+   'MAC_IA32_EXPORTS': [
+     'libvpx/vpx/vp8.h',
+     'libvpx/vpx/vp8cx.h',
+     'libvpx/vpx/vp8dx.h',
+     'libvpx/vpx/vpx_codec.h',
+     'libvpx/vpx/vpx_decoder.h',
+     'libvpx/vpx/vpx_encoder.h',
+     'libvpx/vpx/vpx_ext_ratectrl.h',
+     'libvpx/vpx/vpx_frame_buffer.h',
+     'libvpx/vpx/vpx_image.h',
+     'libvpx/vpx/vpx_integer.h',
+     'libvpx/vpx/vpx_tpl.h',
+     'libvpx/vpx_mem/include/vpx_mem_intrnl.h',
+     'libvpx/vpx_mem/vpx_mem.h',
+     'libvpx/vpx_ports/bitops.h',
+     'libvpx/vpx_ports/compiler_attributes.h',
+     'libvpx/vpx_ports/mem.h',
+     'libvpx/vpx_ports/static_assert.h',
+     'libvpx/vpx_ports/system_state.h',
+     'libvpx/vpx_ports/vpx_timer.h',
+     'libvpx/vpx_ports/x86.h',
+     'libvpx/vpx_scale/vpx_scale.h',
+     'libvpx/vpx_scale/yv12config.h',
+ ],
+   'MAC_IA32_SOURCES': [
+     'libvpx/../config/mac/ia32/vpx_config.c',
+     'libvpx/vp8/common/alloccommon.c',
+     'libvpx/vp8/common/blockd.c',
+     'libvpx/vp8/common/dequantize.c',
+     'libvpx/vp8/common/entropy.c',
+     'libvpx/vp8/common/entropymode.c',
+     'libvpx/vp8/common/entropymv.c',
+     'libvpx/vp8/common/extend.c',
+     'libvpx/vp8/common/filter.c',
+     'libvpx/vp8/common/findnearmv.c',
+     'libvpx/vp8/common/generic/systemdependent.c',
+     'libvpx/vp8/common/idct_blk.c',
+     'libvpx/vp8/common/idctllm.c',
+     'libvpx/vp8/common/loopfilter_filters.c',
+     'libvpx/vp8/common/mbpitch.c',
+     'libvpx/vp8/common/mfqe.c',
+     'libvpx/vp8/common/modecont.c',
+     'libvpx/vp8/common/postproc.c',
+     'libvpx/vp8/common/quant_common.c',
+     'libvpx/vp8/common/reconinter.c',
+     'libvpx/vp8/common/reconintra.c',
+     'libvpx/vp8/common/reconintra4x4.c',
+     'libvpx/vp8/common/rtcd.c',
+     'libvpx/vp8/common/setupintrarecon.c',
+     'libvpx/vp8/common/swapyv12buffer.c',
+     'libvpx/vp8/common/treecoder.c',
+     'libvpx/vp8/common/vp8_loopfilter.c',
+     'libvpx/vp8/common/vp8_skin_detection.c',
+     'libvpx/vp8/common/x86/bilinear_filter_sse2.c',
+     'libvpx/vp8/common/x86/dequantize_mmx.asm',
+     'libvpx/vp8/common/x86/idct_blk_mmx.c',
+     'libvpx/vp8/common/x86/idct_blk_sse2.c',
+     'libvpx/vp8/common/x86/idctllm_mmx.asm',
+     'libvpx/vp8/common/x86/idctllm_sse2.asm',
+     'libvpx/vp8/common/x86/iwalsh_sse2.asm',
+     'libvpx/vp8/common/x86/loopfilter_sse2.asm',
+     'libvpx/vp8/common/x86/loopfilter_x86.c',
+     'libvpx/vp8/common/x86/mfqe_sse2.asm',
+     'libvpx/vp8/common/x86/recon_mmx.asm',
+     'libvpx/vp8/common/x86/recon_sse2.asm',
+     'libvpx/vp8/common/x86/subpixel_mmx.asm',
+     'libvpx/vp8/common/x86/subpixel_sse2.asm',
+     'libvpx/vp8/common/x86/subpixel_ssse3.asm',
+     'libvpx/vp8/common/x86/vp8_asm_stubs.c',
+     'libvpx/vp8/decoder/dboolhuff.c',
+     'libvpx/vp8/decoder/decodeframe.c',
+     'libvpx/vp8/decoder/decodemv.c',
+     'libvpx/vp8/decoder/detokenize.c',
+     'libvpx/vp8/decoder/onyxd_if.c',
+     'libvpx/vp8/decoder/threading.c',
+     'libvpx/vp8/encoder/bitstream.c',
+     'libvpx/vp8/encoder/boolhuff.c',
+     'libvpx/vp8/encoder/copy_c.c',
+     'libvpx/vp8/encoder/dct.c',
+     'libvpx/vp8/encoder/denoising.c',
+     'libvpx/vp8/encoder/encodeframe.c',
+     'libvpx/vp8/encoder/encodeintra.c',
+     'libvpx/vp8/encoder/encodemb.c',
+     'libvpx/vp8/encoder/encodemv.c',
+     'libvpx/vp8/encoder/ethreading.c',
+     'libvpx/vp8/encoder/firstpass.c',
+     'libvpx/vp8/encoder/lookahead.c',
+     'libvpx/vp8/encoder/mcomp.c',
+     'libvpx/vp8/encoder/modecosts.c',
+     'libvpx/vp8/encoder/mr_dissim.c',
+     'libvpx/vp8/encoder/onyx_if.c',
+     'libvpx/vp8/encoder/pickinter.c',
+     'libvpx/vp8/encoder/picklpf.c',
+     'libvpx/vp8/encoder/ratectrl.c',
+     'libvpx/vp8/encoder/rdopt.c',
+     'libvpx/vp8/encoder/segmentation.c',
+     'libvpx/vp8/encoder/temporal_filter.c',
+     'libvpx/vp8/encoder/tokenize.c',
+     'libvpx/vp8/encoder/treewriter.c',
+     'libvpx/vp8/encoder/vp8_quantize.c',
+     'libvpx/vp8/encoder/x86/block_error_sse2.asm',
+     'libvpx/vp8/encoder/x86/copy_sse2.asm',
+     'libvpx/vp8/encoder/x86/copy_sse3.asm',
+     'libvpx/vp8/encoder/x86/dct_sse2.asm',
+     'libvpx/vp8/encoder/x86/denoising_sse2.c',
+     'libvpx/vp8/encoder/x86/fwalsh_sse2.asm',
+     'libvpx/vp8/encoder/x86/quantize_sse4.c',
+     'libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm',
+     'libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
+     'libvpx/vp8/encoder/x86/vp8_quantize_sse2.c',
+     'libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c',
+     'libvpx/vp8/vp8_cx_iface.c',
+     'libvpx/vp8/vp8_dx_iface.c',
+     'libvpx/vp9/common/vp9_alloccommon.c',
+     'libvpx/vp9/common/vp9_blockd.c',
+     'libvpx/vp9/common/vp9_common_data.c',
+     'libvpx/vp9/common/vp9_entropy.c',
+     'libvpx/vp9/common/vp9_entropymode.c',
+     'libvpx/vp9/common/vp9_entropymv.c',
+     'libvpx/vp9/common/vp9_filter.c',
+     'libvpx/vp9/common/vp9_frame_buffers.c',
+     'libvpx/vp9/common/vp9_idct.c',
+     'libvpx/vp9/common/vp9_loopfilter.c',
+     'libvpx/vp9/common/vp9_mfqe.c',
+     'libvpx/vp9/common/vp9_mvref_common.c',
+     'libvpx/vp9/common/vp9_postproc.c',
+     'libvpx/vp9/common/vp9_pred_common.c',
+     'libvpx/vp9/common/vp9_quant_common.c',
+     'libvpx/vp9/common/vp9_reconinter.c',
+     'libvpx/vp9/common/vp9_reconintra.c',
+     'libvpx/vp9/common/vp9_rtcd.c',
+     'libvpx/vp9/common/vp9_scale.c',
+     'libvpx/vp9/common/vp9_scan.c',
+     'libvpx/vp9/common/vp9_seg_common.c',
+     'libvpx/vp9/common/vp9_thread_common.c',
+     'libvpx/vp9/common/vp9_tile_common.c',
+     'libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c',
+     'libvpx/vp9/common/x86/vp9_mfqe_sse2.asm',
+     'libvpx/vp9/decoder/vp9_decodeframe.c',
+     'libvpx/vp9/decoder/vp9_decodemv.c',
+     'libvpx/vp9/decoder/vp9_decoder.c',
+     'libvpx/vp9/decoder/vp9_detokenize.c',
+     'libvpx/vp9/decoder/vp9_dsubexp.c',
+     'libvpx/vp9/decoder/vp9_job_queue.c',
+     'libvpx/vp9/encoder/vp9_alt_ref_aq.c',
+     'libvpx/vp9/encoder/vp9_aq_360.c',
+     'libvpx/vp9/encoder/vp9_aq_complexity.c',
+     'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c',
+     'libvpx/vp9/encoder/vp9_aq_variance.c',
+     'libvpx/vp9/encoder/vp9_bitstream.c',
+     'libvpx/vp9/encoder/vp9_context_tree.c',
+     'libvpx/vp9/encoder/vp9_cost.c',
+     'libvpx/vp9/encoder/vp9_dct.c',
+     'libvpx/vp9/encoder/vp9_encodeframe.c',
+     'libvpx/vp9/encoder/vp9_encodemb.c',
+     'libvpx/vp9/encoder/vp9_encodemv.c',
+     'libvpx/vp9/encoder/vp9_encoder.c',
+     'libvpx/vp9/encoder/vp9_ethread.c',
+     'libvpx/vp9/encoder/vp9_ext_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_extend.c',
+     'libvpx/vp9/encoder/vp9_firstpass.c',
+     'libvpx/vp9/encoder/vp9_frame_scale.c',
+     'libvpx/vp9/encoder/vp9_lookahead.c',
+     'libvpx/vp9/encoder/vp9_mbgraph.c',
+     'libvpx/vp9/encoder/vp9_mcomp.c',
+     'libvpx/vp9/encoder/vp9_multi_thread.c',
+     'libvpx/vp9/encoder/vp9_noise_estimate.c',
+     'libvpx/vp9/encoder/vp9_picklpf.c',
+     'libvpx/vp9/encoder/vp9_pickmode.c',
+     'libvpx/vp9/encoder/vp9_quantize.c',
+     'libvpx/vp9/encoder/vp9_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_rd.c',
+     'libvpx/vp9/encoder/vp9_rdopt.c',
+     'libvpx/vp9/encoder/vp9_resize.c',
+     'libvpx/vp9/encoder/vp9_segmentation.c',
+     'libvpx/vp9/encoder/vp9_skin_detection.c',
+     'libvpx/vp9/encoder/vp9_speed_features.c',
+     'libvpx/vp9/encoder/vp9_subexp.c',
+     'libvpx/vp9/encoder/vp9_svc_layercontext.c',
+     'libvpx/vp9/encoder/vp9_temporal_filter.c',
+     'libvpx/vp9/encoder/vp9_tokenize.c',
+     'libvpx/vp9/encoder/vp9_tpl_model.c',
+     'libvpx/vp9/encoder/vp9_treewriter.c',
+     'libvpx/vp9/encoder/x86/temporal_filter_sse4.c',
+     'libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c',
+     'libvpx/vp9/encoder/x86/vp9_dct_sse2.asm',
+     'libvpx/vp9/encoder/x86/vp9_error_avx2.c',
+     'libvpx/vp9/encoder/x86/vp9_error_sse2.asm',
+     'libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_avx2.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_sse2.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c',
+     'libvpx/vp9/vp9_cx_iface.c',
+     'libvpx/vp9/vp9_dx_iface.c',
+     'libvpx/vp9/vp9_iface_common.c',
+     'libvpx/vpx/src/vpx_codec.c',
+     'libvpx/vpx/src/vpx_decoder.c',
+     'libvpx/vpx/src/vpx_encoder.c',
+     'libvpx/vpx/src/vpx_image.c',
+     'libvpx/vpx_dsp/add_noise.c',
+     'libvpx/vpx_dsp/avg.c',
+     'libvpx/vpx_dsp/bitreader.c',
+     'libvpx/vpx_dsp/bitreader_buffer.c',
+     'libvpx/vpx_dsp/bitwriter.c',
+     'libvpx/vpx_dsp/bitwriter_buffer.c',
+     'libvpx/vpx_dsp/deblock.c',
+     'libvpx/vpx_dsp/fwd_txfm.c',
+     'libvpx/vpx_dsp/intrapred.c',
+     'libvpx/vpx_dsp/inv_txfm.c',
+     'libvpx/vpx_dsp/loopfilter.c',
+     'libvpx/vpx_dsp/prob.c',
+     'libvpx/vpx_dsp/psnr.c',
+     'libvpx/vpx_dsp/quantize.c',
+     'libvpx/vpx_dsp/sad.c',
+     'libvpx/vpx_dsp/skin_detection.c',
+     'libvpx/vpx_dsp/sse.c',
+     'libvpx/vpx_dsp/subtract.c',
+     'libvpx/vpx_dsp/sum_squares.c',
+     'libvpx/vpx_dsp/variance.c',
+     'libvpx/vpx_dsp/vpx_convolve.c',
+     'libvpx/vpx_dsp/vpx_dsp_rtcd.c',
+     'libvpx/vpx_dsp/x86/add_noise_sse2.asm',
+     'libvpx/vpx_dsp/x86/avg_intrin_avx2.c',
+     'libvpx/vpx_dsp/x86/avg_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/avg_pred_avx2.c',
+     'libvpx/vpx_dsp/x86/avg_pred_sse2.c',
+     'libvpx/vpx_dsp/x86/deblock_sse2.asm',
+     'libvpx/vpx_dsp/x86/fwd_txfm_avx2.c',
+     'libvpx/vpx_dsp/x86/fwd_txfm_sse2.c',
+     'libvpx/vpx_dsp/x86/intrapred_sse2.asm',
+     'libvpx/vpx_dsp/x86/intrapred_ssse3.asm',
+     'libvpx/vpx_dsp/x86/inv_txfm_avx2.c',
+     'libvpx/vpx_dsp/x86/inv_txfm_sse2.c',
+     'libvpx/vpx_dsp/x86/inv_txfm_ssse3.c',
+     'libvpx/vpx_dsp/x86/inv_wht_sse2.asm',
+     'libvpx/vpx_dsp/x86/loopfilter_avx2.c',
+     'libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/post_proc_sse2.c',
+     'libvpx/vpx_dsp/x86/quantize_avx.c',
+     'libvpx/vpx_dsp/x86/quantize_avx2.c',
+     'libvpx/vpx_dsp/x86/quantize_sse2.c',
+     'libvpx/vpx_dsp/x86/quantize_ssse3.c',
+     'libvpx/vpx_dsp/x86/sad4d_avx2.c',
+     'libvpx/vpx_dsp/x86/sad4d_sse2.asm',
+     'libvpx/vpx_dsp/x86/sad_avx2.c',
+     'libvpx/vpx_dsp/x86/sad_sse2.asm',
+     'libvpx/vpx_dsp/x86/sse_avx2.c',
+     'libvpx/vpx_dsp/x86/sse_sse4.c',
+     'libvpx/vpx_dsp/x86/subpel_variance_sse2.asm',
+     'libvpx/vpx_dsp/x86/subtract_avx2.c',
+     'libvpx/vpx_dsp/x86/subtract_sse2.asm',
+     'libvpx/vpx_dsp/x86/sum_squares_sse2.c',
+     'libvpx/vpx_dsp/x86/variance_avx2.c',
+     'libvpx/vpx_dsp/x86/variance_sse2.c',
+     'libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm',
+     'libvpx/vpx_mem/vpx_mem.c',
+     'libvpx/vpx_ports/emms_mmx.c',
+     'libvpx/vpx_scale/generic/gen_scalers.c',
+     'libvpx/vpx_scale/generic/vpx_scale.c',
+     'libvpx/vpx_scale/generic/yv12config.c',
+     'libvpx/vpx_scale/generic/yv12extend.c',
+     'libvpx/vpx_scale/vpx_scale_rtcd.c',
+     'libvpx/vpx_util/vpx_thread.c',
+     'libvpx/vpx_util/vpx_write_yuv_frame.c',
+ ],
+   'WIN_IA32_EXPORTS': [
+     'libvpx/vpx/vp8.h',
+     'libvpx/vpx/vp8cx.h',
+     'libvpx/vpx/vp8dx.h',
+     'libvpx/vpx/vpx_codec.h',
+     'libvpx/vpx/vpx_decoder.h',
+     'libvpx/vpx/vpx_encoder.h',
+     'libvpx/vpx/vpx_ext_ratectrl.h',
+     'libvpx/vpx/vpx_frame_buffer.h',
+     'libvpx/vpx/vpx_image.h',
+     'libvpx/vpx/vpx_integer.h',
+     'libvpx/vpx/vpx_tpl.h',
+     'libvpx/vpx_mem/include/vpx_mem_intrnl.h',
+     'libvpx/vpx_mem/vpx_mem.h',
+     'libvpx/vpx_ports/bitops.h',
+     'libvpx/vpx_ports/compiler_attributes.h',
+     'libvpx/vpx_ports/mem.h',
+     'libvpx/vpx_ports/static_assert.h',
+     'libvpx/vpx_ports/system_state.h',
+     'libvpx/vpx_ports/vpx_timer.h',
+     'libvpx/vpx_ports/x86.h',
+     'libvpx/vpx_scale/vpx_scale.h',
+     'libvpx/vpx_scale/yv12config.h',
+ ],
+   'WIN_IA32_SOURCES': [
+     'libvpx/../config/win/ia32/vpx_config.c',
+     'libvpx/vp8/common/alloccommon.c',
+     'libvpx/vp8/common/blockd.c',
+     'libvpx/vp8/common/dequantize.c',
+     'libvpx/vp8/common/entropy.c',
+     'libvpx/vp8/common/entropymode.c',
+     'libvpx/vp8/common/entropymv.c',
+     'libvpx/vp8/common/extend.c',
+     'libvpx/vp8/common/filter.c',
+     'libvpx/vp8/common/findnearmv.c',
+     'libvpx/vp8/common/generic/systemdependent.c',
+     'libvpx/vp8/common/idct_blk.c',
+     'libvpx/vp8/common/idctllm.c',
+     'libvpx/vp8/common/loopfilter_filters.c',
+     'libvpx/vp8/common/mbpitch.c',
+     'libvpx/vp8/common/mfqe.c',
+     'libvpx/vp8/common/modecont.c',
+     'libvpx/vp8/common/postproc.c',
+     'libvpx/vp8/common/quant_common.c',
+     'libvpx/vp8/common/reconinter.c',
+     'libvpx/vp8/common/reconintra.c',
+     'libvpx/vp8/common/reconintra4x4.c',
+     'libvpx/vp8/common/rtcd.c',
+     'libvpx/vp8/common/setupintrarecon.c',
+     'libvpx/vp8/common/swapyv12buffer.c',
+     'libvpx/vp8/common/treecoder.c',
+     'libvpx/vp8/common/vp8_loopfilter.c',
+     'libvpx/vp8/common/vp8_skin_detection.c',
+     'libvpx/vp8/common/x86/bilinear_filter_sse2.c',
+     'libvpx/vp8/common/x86/dequantize_mmx.asm',
+     'libvpx/vp8/common/x86/idct_blk_mmx.c',
+     'libvpx/vp8/common/x86/idct_blk_sse2.c',
+     'libvpx/vp8/common/x86/idctllm_mmx.asm',
+     'libvpx/vp8/common/x86/idctllm_sse2.asm',
+     'libvpx/vp8/common/x86/iwalsh_sse2.asm',
+     'libvpx/vp8/common/x86/loopfilter_sse2.asm',
+     'libvpx/vp8/common/x86/loopfilter_x86.c',
+     'libvpx/vp8/common/x86/mfqe_sse2.asm',
+     'libvpx/vp8/common/x86/recon_mmx.asm',
+     'libvpx/vp8/common/x86/recon_sse2.asm',
+     'libvpx/vp8/common/x86/subpixel_mmx.asm',
+     'libvpx/vp8/common/x86/subpixel_sse2.asm',
+     'libvpx/vp8/common/x86/subpixel_ssse3.asm',
+     'libvpx/vp8/common/x86/vp8_asm_stubs.c',
+     'libvpx/vp8/decoder/dboolhuff.c',
+     'libvpx/vp8/decoder/decodeframe.c',
+     'libvpx/vp8/decoder/decodemv.c',
+     'libvpx/vp8/decoder/detokenize.c',
+     'libvpx/vp8/decoder/onyxd_if.c',
+     'libvpx/vp8/decoder/threading.c',
+     'libvpx/vp8/encoder/bitstream.c',
+     'libvpx/vp8/encoder/boolhuff.c',
+     'libvpx/vp8/encoder/copy_c.c',
+     'libvpx/vp8/encoder/dct.c',
+     'libvpx/vp8/encoder/denoising.c',
+     'libvpx/vp8/encoder/encodeframe.c',
+     'libvpx/vp8/encoder/encodeintra.c',
+     'libvpx/vp8/encoder/encodemb.c',
+     'libvpx/vp8/encoder/encodemv.c',
+     'libvpx/vp8/encoder/ethreading.c',
+     'libvpx/vp8/encoder/firstpass.c',
+     'libvpx/vp8/encoder/lookahead.c',
+     'libvpx/vp8/encoder/mcomp.c',
+     'libvpx/vp8/encoder/modecosts.c',
+     'libvpx/vp8/encoder/mr_dissim.c',
+     'libvpx/vp8/encoder/onyx_if.c',
+     'libvpx/vp8/encoder/pickinter.c',
+     'libvpx/vp8/encoder/picklpf.c',
+     'libvpx/vp8/encoder/ratectrl.c',
+     'libvpx/vp8/encoder/rdopt.c',
+     'libvpx/vp8/encoder/segmentation.c',
+     'libvpx/vp8/encoder/temporal_filter.c',
+     'libvpx/vp8/encoder/tokenize.c',
+     'libvpx/vp8/encoder/treewriter.c',
+     'libvpx/vp8/encoder/vp8_quantize.c',
+     'libvpx/vp8/encoder/x86/block_error_sse2.asm',
+     'libvpx/vp8/encoder/x86/copy_sse2.asm',
+     'libvpx/vp8/encoder/x86/copy_sse3.asm',
+     'libvpx/vp8/encoder/x86/dct_sse2.asm',
+     'libvpx/vp8/encoder/x86/denoising_sse2.c',
+     'libvpx/vp8/encoder/x86/fwalsh_sse2.asm',
+     'libvpx/vp8/encoder/x86/quantize_sse4.c',
+     'libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm',
+     'libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
+     'libvpx/vp8/encoder/x86/vp8_quantize_sse2.c',
+     'libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c',
+     'libvpx/vp8/vp8_cx_iface.c',
+     'libvpx/vp8/vp8_dx_iface.c',
+     'libvpx/vp9/common/vp9_alloccommon.c',
+     'libvpx/vp9/common/vp9_blockd.c',
+     'libvpx/vp9/common/vp9_common_data.c',
+     'libvpx/vp9/common/vp9_entropy.c',
+     'libvpx/vp9/common/vp9_entropymode.c',
+     'libvpx/vp9/common/vp9_entropymv.c',
+     'libvpx/vp9/common/vp9_filter.c',
+     'libvpx/vp9/common/vp9_frame_buffers.c',
+     'libvpx/vp9/common/vp9_idct.c',
+     'libvpx/vp9/common/vp9_loopfilter.c',
+     'libvpx/vp9/common/vp9_mfqe.c',
+     'libvpx/vp9/common/vp9_mvref_common.c',
+     'libvpx/vp9/common/vp9_postproc.c',
+     'libvpx/vp9/common/vp9_pred_common.c',
+     'libvpx/vp9/common/vp9_quant_common.c',
+     'libvpx/vp9/common/vp9_reconinter.c',
+     'libvpx/vp9/common/vp9_reconintra.c',
+     'libvpx/vp9/common/vp9_rtcd.c',
+     'libvpx/vp9/common/vp9_scale.c',
+     'libvpx/vp9/common/vp9_scan.c',
+     'libvpx/vp9/common/vp9_seg_common.c',
+     'libvpx/vp9/common/vp9_thread_common.c',
+     'libvpx/vp9/common/vp9_tile_common.c',
+     'libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c',
+     'libvpx/vp9/common/x86/vp9_mfqe_sse2.asm',
+     'libvpx/vp9/decoder/vp9_decodeframe.c',
+     'libvpx/vp9/decoder/vp9_decodemv.c',
+     'libvpx/vp9/decoder/vp9_decoder.c',
+     'libvpx/vp9/decoder/vp9_detokenize.c',
+     'libvpx/vp9/decoder/vp9_dsubexp.c',
+     'libvpx/vp9/decoder/vp9_job_queue.c',
+     'libvpx/vp9/encoder/vp9_alt_ref_aq.c',
+     'libvpx/vp9/encoder/vp9_aq_360.c',
+     'libvpx/vp9/encoder/vp9_aq_complexity.c',
+     'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c',
+     'libvpx/vp9/encoder/vp9_aq_variance.c',
+     'libvpx/vp9/encoder/vp9_bitstream.c',
+     'libvpx/vp9/encoder/vp9_context_tree.c',
+     'libvpx/vp9/encoder/vp9_cost.c',
+     'libvpx/vp9/encoder/vp9_dct.c',
+     'libvpx/vp9/encoder/vp9_encodeframe.c',
+     'libvpx/vp9/encoder/vp9_encodemb.c',
+     'libvpx/vp9/encoder/vp9_encodemv.c',
+     'libvpx/vp9/encoder/vp9_encoder.c',
+     'libvpx/vp9/encoder/vp9_ethread.c',
+     'libvpx/vp9/encoder/vp9_ext_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_extend.c',
+     'libvpx/vp9/encoder/vp9_firstpass.c',
+     'libvpx/vp9/encoder/vp9_frame_scale.c',
+     'libvpx/vp9/encoder/vp9_lookahead.c',
+     'libvpx/vp9/encoder/vp9_mbgraph.c',
+     'libvpx/vp9/encoder/vp9_mcomp.c',
+     'libvpx/vp9/encoder/vp9_multi_thread.c',
+     'libvpx/vp9/encoder/vp9_noise_estimate.c',
+     'libvpx/vp9/encoder/vp9_picklpf.c',
+     'libvpx/vp9/encoder/vp9_pickmode.c',
+     'libvpx/vp9/encoder/vp9_quantize.c',
+     'libvpx/vp9/encoder/vp9_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_rd.c',
+     'libvpx/vp9/encoder/vp9_rdopt.c',
+     'libvpx/vp9/encoder/vp9_resize.c',
+     'libvpx/vp9/encoder/vp9_segmentation.c',
+     'libvpx/vp9/encoder/vp9_skin_detection.c',
+     'libvpx/vp9/encoder/vp9_speed_features.c',
+     'libvpx/vp9/encoder/vp9_subexp.c',
+     'libvpx/vp9/encoder/vp9_svc_layercontext.c',
+     'libvpx/vp9/encoder/vp9_temporal_filter.c',
+     'libvpx/vp9/encoder/vp9_tokenize.c',
+     'libvpx/vp9/encoder/vp9_tpl_model.c',
+     'libvpx/vp9/encoder/vp9_treewriter.c',
+     'libvpx/vp9/encoder/x86/temporal_filter_sse4.c',
+     'libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c',
+     'libvpx/vp9/encoder/x86/vp9_dct_sse2.asm',
+     'libvpx/vp9/encoder/x86/vp9_error_avx2.c',
+     'libvpx/vp9/encoder/x86/vp9_error_sse2.asm',
+     'libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_avx2.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_sse2.c',
+     'libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c',
+     'libvpx/vp9/vp9_cx_iface.c',
+     'libvpx/vp9/vp9_dx_iface.c',
+     'libvpx/vp9/vp9_iface_common.c',
+     'libvpx/vpx/src/vpx_codec.c',
+     'libvpx/vpx/src/vpx_decoder.c',
+     'libvpx/vpx/src/vpx_encoder.c',
+     'libvpx/vpx/src/vpx_image.c',
+     'libvpx/vpx_dsp/add_noise.c',
+     'libvpx/vpx_dsp/avg.c',
+     'libvpx/vpx_dsp/bitreader.c',
+     'libvpx/vpx_dsp/bitreader_buffer.c',
+     'libvpx/vpx_dsp/bitwriter.c',
+     'libvpx/vpx_dsp/bitwriter_buffer.c',
+     'libvpx/vpx_dsp/deblock.c',
+     'libvpx/vpx_dsp/fwd_txfm.c',
+     'libvpx/vpx_dsp/intrapred.c',
+     'libvpx/vpx_dsp/inv_txfm.c',
+     'libvpx/vpx_dsp/loopfilter.c',
+     'libvpx/vpx_dsp/prob.c',
+     'libvpx/vpx_dsp/psnr.c',
+     'libvpx/vpx_dsp/quantize.c',
+     'libvpx/vpx_dsp/sad.c',
+     'libvpx/vpx_dsp/skin_detection.c',
+     'libvpx/vpx_dsp/sse.c',
+     'libvpx/vpx_dsp/subtract.c',
+     'libvpx/vpx_dsp/sum_squares.c',
+     'libvpx/vpx_dsp/variance.c',
+     'libvpx/vpx_dsp/vpx_convolve.c',
+     'libvpx/vpx_dsp/vpx_dsp_rtcd.c',
+     'libvpx/vpx_dsp/x86/add_noise_sse2.asm',
+     'libvpx/vpx_dsp/x86/avg_intrin_avx2.c',
+     'libvpx/vpx_dsp/x86/avg_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/avg_pred_avx2.c',
+     'libvpx/vpx_dsp/x86/avg_pred_sse2.c',
+     'libvpx/vpx_dsp/x86/deblock_sse2.asm',
+     'libvpx/vpx_dsp/x86/fwd_txfm_avx2.c',
+     'libvpx/vpx_dsp/x86/fwd_txfm_sse2.c',
+     'libvpx/vpx_dsp/x86/intrapred_sse2.asm',
+     'libvpx/vpx_dsp/x86/intrapred_ssse3.asm',
+     'libvpx/vpx_dsp/x86/inv_txfm_avx2.c',
+     'libvpx/vpx_dsp/x86/inv_txfm_sse2.c',
+     'libvpx/vpx_dsp/x86/inv_txfm_ssse3.c',
+     'libvpx/vpx_dsp/x86/inv_wht_sse2.asm',
+     'libvpx/vpx_dsp/x86/loopfilter_avx2.c',
+     'libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/post_proc_sse2.c',
+     'libvpx/vpx_dsp/x86/quantize_avx.c',
+     'libvpx/vpx_dsp/x86/quantize_avx2.c',
+     'libvpx/vpx_dsp/x86/quantize_sse2.c',
+     'libvpx/vpx_dsp/x86/quantize_ssse3.c',
+     'libvpx/vpx_dsp/x86/sad4d_avx2.c',
+     'libvpx/vpx_dsp/x86/sad4d_sse2.asm',
+     'libvpx/vpx_dsp/x86/sad_avx2.c',
+     'libvpx/vpx_dsp/x86/sad_sse2.asm',
+     'libvpx/vpx_dsp/x86/sse_avx2.c',
+     'libvpx/vpx_dsp/x86/sse_sse4.c',
+     'libvpx/vpx_dsp/x86/subpel_variance_sse2.asm',
+     'libvpx/vpx_dsp/x86/subtract_avx2.c',
+     'libvpx/vpx_dsp/x86/subtract_sse2.asm',
+     'libvpx/vpx_dsp/x86/sum_squares_sse2.c',
+     'libvpx/vpx_dsp/x86/variance_avx2.c',
+     'libvpx/vpx_dsp/x86/variance_sse2.c',
+     'libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm',
+     'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm',
+     'libvpx/vpx_mem/vpx_mem.c',
+     'libvpx/vpx_ports/emms_mmx.c',
+     'libvpx/vpx_scale/generic/gen_scalers.c',
+     'libvpx/vpx_scale/generic/vpx_scale.c',
+     'libvpx/vpx_scale/generic/yv12config.c',
+     'libvpx/vpx_scale/generic/yv12extend.c',
+     'libvpx/vpx_scale/vpx_scale_rtcd.c',
+     'libvpx/vpx_util/vpx_thread.c',
+     'libvpx/vpx_util/vpx_write_yuv_frame.c',
 -],
 -  'LINUX_ARM_EXPORTS': [
 -    'libvpx/vpx/vp8.h',
 -    'libvpx/vpx/vp8cx.h',
 -    'libvpx/vpx/vp8dx.h',
 -    'libvpx/vpx/vpx_codec.h',
 -    'libvpx/vpx/vpx_decoder.h',
 -    'libvpx/vpx/vpx_encoder.h',
 -    'libvpx/vpx/vpx_ext_ratectrl.h',
 -    'libvpx/vpx/vpx_frame_buffer.h',
 -    'libvpx/vpx/vpx_image.h',
 -    'libvpx/vpx/vpx_integer.h',
 -    'libvpx/vpx/vpx_tpl.h',
 -    'libvpx/vpx_mem/include/vpx_mem_intrnl.h',
 -    'libvpx/vpx_mem/vpx_mem.h',
 -    'libvpx/vpx_ports/arm.h',
 -    'libvpx/vpx_ports/arm_cpudetect.h',
 -    'libvpx/vpx_ports/bitops.h',
 -    'libvpx/vpx_ports/compiler_attributes.h',
 -    'libvpx/vpx_ports/mem.h',
 -    'libvpx/vpx_ports/static_assert.h',
 -    'libvpx/vpx_ports/system_state.h',
 -    'libvpx/vpx_ports/vpx_timer.h',
 -    'libvpx/vpx_scale/vpx_scale.h',
 -    'libvpx/vpx_scale/yv12config.h',
 -],
 -  'LINUX_ARM_SOURCES': [
 -    'libvpx/../config/linux/arm/vpx_config.c',
 -    'libvpx/vp8/common/alloccommon.c',
 -    'libvpx/vp8/common/arm/loopfilter_arm.c',
 -    'libvpx/vp8/common/arm/neon/bilinearpredict_neon.c',
 -    'libvpx/vp8/common/arm/neon/copymem_neon.c',
 -    'libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c',
 -    'libvpx/vp8/common/arm/neon/dequant_idct_neon.c',
 -    'libvpx/vp8/common/arm/neon/dequantizeb_neon.c',
 -    'libvpx/vp8/common/arm/neon/idct_blk_neon.c',
 -    'libvpx/vp8/common/arm/neon/iwalsh_neon.c',
 -    'libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c',
 -    'libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c',
 -    'libvpx/vp8/common/arm/neon/mbloopfilter_neon.c',
 -    'libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c',
 -    'libvpx/vp8/common/arm/neon/sixtappredict_neon.c',
 -    'libvpx/vp8/common/arm/neon/vp8_loopfilter_neon.c',
 -    'libvpx/vp8/common/blockd.c',
 -    'libvpx/vp8/common/dequantize.c',
 -    'libvpx/vp8/common/entropy.c',
 -    'libvpx/vp8/common/entropymode.c',
 -    'libvpx/vp8/common/entropymv.c',
 -    'libvpx/vp8/common/extend.c',
 -    'libvpx/vp8/common/filter.c',
 -    'libvpx/vp8/common/findnearmv.c',
 -    'libvpx/vp8/common/generic/systemdependent.c',
 -    'libvpx/vp8/common/idct_blk.c',
 -    'libvpx/vp8/common/idctllm.c',
 -    'libvpx/vp8/common/loopfilter_filters.c',
 -    'libvpx/vp8/common/mbpitch.c',
 -    'libvpx/vp8/common/modecont.c',
 -    'libvpx/vp8/common/quant_common.c',
 -    'libvpx/vp8/common/reconinter.c',
 -    'libvpx/vp8/common/reconintra.c',
 -    'libvpx/vp8/common/reconintra4x4.c',
 -    'libvpx/vp8/common/rtcd.c',
 -    'libvpx/vp8/common/setupintrarecon.c',
 -    'libvpx/vp8/common/swapyv12buffer.c',
 -    'libvpx/vp8/common/treecoder.c',
 -    'libvpx/vp8/common/vp8_loopfilter.c',
 -    'libvpx/vp8/common/vp8_skin_detection.c',
 -    'libvpx/vp8/decoder/dboolhuff.c',
 -    'libvpx/vp8/decoder/decodeframe.c',
 -    'libvpx/vp8/decoder/decodemv.c',
 -    'libvpx/vp8/decoder/detokenize.c',
 -    'libvpx/vp8/decoder/onyxd_if.c',
 -    'libvpx/vp8/decoder/threading.c',
 -    'libvpx/vp8/encoder/arm/neon/denoising_neon.c',
 -    'libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c',
 -    'libvpx/vp8/encoder/arm/neon/shortfdct_neon.c',
 -    'libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c',
 -    'libvpx/vp8/encoder/bitstream.c',
 -    'libvpx/vp8/encoder/boolhuff.c',
 -    'libvpx/vp8/encoder/copy_c.c',
 -    'libvpx/vp8/encoder/dct.c',
 -    'libvpx/vp8/encoder/denoising.c',
 -    'libvpx/vp8/encoder/encodeframe.c',
 -    'libvpx/vp8/encoder/encodeintra.c',
 -    'libvpx/vp8/encoder/encodemb.c',
 -    'libvpx/vp8/encoder/encodemv.c',
 -    'libvpx/vp8/encoder/ethreading.c',
 -    'libvpx/vp8/encoder/lookahead.c',
 -    'libvpx/vp8/encoder/mcomp.c',
 -    'libvpx/vp8/encoder/modecosts.c',
 -    'libvpx/vp8/encoder/mr_dissim.c',
 -    'libvpx/vp8/encoder/onyx_if.c',
 -    'libvpx/vp8/encoder/pickinter.c',
 -    'libvpx/vp8/encoder/picklpf.c',
 -    'libvpx/vp8/encoder/ratectrl.c',
 -    'libvpx/vp8/encoder/rdopt.c',
 -    'libvpx/vp8/encoder/segmentation.c',
 -    'libvpx/vp8/encoder/tokenize.c',
 -    'libvpx/vp8/encoder/treewriter.c',
 -    'libvpx/vp8/encoder/vp8_quantize.c',
 -    'libvpx/vp8/vp8_cx_iface.c',
 -    'libvpx/vp8/vp8_dx_iface.c',
 -    'libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c',
 -    'libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c',
 -    'libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c',
 -    'libvpx/vp9/common/vp9_alloccommon.c',
 -    'libvpx/vp9/common/vp9_blockd.c',
 -    'libvpx/vp9/common/vp9_common_data.c',
 -    'libvpx/vp9/common/vp9_entropy.c',
 -    'libvpx/vp9/common/vp9_entropymode.c',
 -    'libvpx/vp9/common/vp9_entropymv.c',
 -    'libvpx/vp9/common/vp9_filter.c',
 -    'libvpx/vp9/common/vp9_frame_buffers.c',
 -    'libvpx/vp9/common/vp9_idct.c',
 -    'libvpx/vp9/common/vp9_loopfilter.c',
 -    'libvpx/vp9/common/vp9_mvref_common.c',
 -    'libvpx/vp9/common/vp9_pred_common.c',
 -    'libvpx/vp9/common/vp9_quant_common.c',
 -    'libvpx/vp9/common/vp9_reconinter.c',
 -    'libvpx/vp9/common/vp9_reconintra.c',
 -    'libvpx/vp9/common/vp9_rtcd.c',
 -    'libvpx/vp9/common/vp9_scale.c',
 -    'libvpx/vp9/common/vp9_scan.c',
 -    'libvpx/vp9/common/vp9_seg_common.c',
 -    'libvpx/vp9/common/vp9_thread_common.c',
 -    'libvpx/vp9/common/vp9_tile_common.c',
 -    'libvpx/vp9/decoder/vp9_decodeframe.c',
 -    'libvpx/vp9/decoder/vp9_decodemv.c',
 -    'libvpx/vp9/decoder/vp9_decoder.c',
 -    'libvpx/vp9/decoder/vp9_detokenize.c',
 -    'libvpx/vp9/decoder/vp9_dsubexp.c',
 -    'libvpx/vp9/decoder/vp9_job_queue.c',
 -    'libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c',
 -    'libvpx/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c',
 -    'libvpx/vp9/encoder/arm/neon/vp9_error_neon.c',
 -    'libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c',
 -    'libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c',
 -    'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c',
 -    'libvpx/vp9/encoder/vp9_bitstream.c',
 -    'libvpx/vp9/encoder/vp9_context_tree.c',
 -    'libvpx/vp9/encoder/vp9_cost.c',
 -    'libvpx/vp9/encoder/vp9_dct.c',
 -    'libvpx/vp9/encoder/vp9_encodeframe.c',
 -    'libvpx/vp9/encoder/vp9_encodemb.c',
 -    'libvpx/vp9/encoder/vp9_encodemv.c',
 -    'libvpx/vp9/encoder/vp9_encoder.c',
 -    'libvpx/vp9/encoder/vp9_ethread.c',
 -    'libvpx/vp9/encoder/vp9_ext_ratectrl.c',
 -    'libvpx/vp9/encoder/vp9_extend.c',
 -    'libvpx/vp9/encoder/vp9_frame_scale.c',
 -    'libvpx/vp9/encoder/vp9_lookahead.c',
 -    'libvpx/vp9/encoder/vp9_mcomp.c',
 -    'libvpx/vp9/encoder/vp9_multi_thread.c',
 -    'libvpx/vp9/encoder/vp9_noise_estimate.c',
 -    'libvpx/vp9/encoder/vp9_picklpf.c',
 -    'libvpx/vp9/encoder/vp9_pickmode.c',
 -    'libvpx/vp9/encoder/vp9_quantize.c',
 -    'libvpx/vp9/encoder/vp9_ratectrl.c',
 -    'libvpx/vp9/encoder/vp9_rd.c',
 -    'libvpx/vp9/encoder/vp9_rdopt.c',
 -    'libvpx/vp9/encoder/vp9_resize.c',
 -    'libvpx/vp9/encoder/vp9_segmentation.c',
 -    'libvpx/vp9/encoder/vp9_skin_detection.c',
 -    'libvpx/vp9/encoder/vp9_speed_features.c',
 -    'libvpx/vp9/encoder/vp9_subexp.c',
 -    'libvpx/vp9/encoder/vp9_svc_layercontext.c',
 -    'libvpx/vp9/encoder/vp9_tokenize.c',
 -    'libvpx/vp9/encoder/vp9_tpl_model.c',
 -    'libvpx/vp9/encoder/vp9_treewriter.c',
 -    'libvpx/vp9/vp9_cx_iface.c',
 -    'libvpx/vp9/vp9_dx_iface.c',
 -    'libvpx/vp9/vp9_iface_common.c',
 -    'libvpx/vpx/src/vpx_codec.c',
 -    'libvpx/vpx/src/vpx_decoder.c',
 -    'libvpx/vpx/src/vpx_encoder.c',
 -    'libvpx/vpx/src/vpx_image.c',
 -    'libvpx/vpx_dsp/arm/avg_neon.c',
 -    'libvpx/vpx_dsp/arm/avg_pred_neon.c',
 -    'libvpx/vpx_dsp/arm/fdct16x16_neon.c',
 -    'libvpx/vpx_dsp/arm/fdct32x32_neon.c',
 -    'libvpx/vpx_dsp/arm/fdct4x4_neon.c',
 -    'libvpx/vpx_dsp/arm/fdct8x8_neon.c',
 -    'libvpx/vpx_dsp/arm/fdct_partial_neon.c',
 -    'libvpx/vpx_dsp/arm/hadamard_neon.c',
 -    'libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c',
 -    'libvpx/vpx_dsp/arm/idct16x16_add_neon.c',
 -    'libvpx/vpx_dsp/arm/idct32x32_135_add_neon.c',
 -    'libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c',
 -    'libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c',
 -    'libvpx/vpx_dsp/arm/idct32x32_add_neon.c',
 -    'libvpx/vpx_dsp/arm/idct4x4_1_add_neon.asm',
 -    'libvpx/vpx_dsp/arm/idct4x4_add_neon.asm',
 -    'libvpx/vpx_dsp/arm/idct8x8_1_add_neon.c',
 -    'libvpx/vpx_dsp/arm/idct8x8_add_neon.c',
 -    'libvpx/vpx_dsp/arm/idct_neon.asm',
 -    'libvpx/vpx_dsp/arm/intrapred_neon.c',
 -    'libvpx/vpx_dsp/arm/intrapred_neon_asm.asm',
 -    'libvpx/vpx_dsp/arm/loopfilter_16_neon.asm',
 -    'libvpx/vpx_dsp/arm/loopfilter_4_neon.asm',
 -    'libvpx/vpx_dsp/arm/loopfilter_8_neon.asm',
 -    'libvpx/vpx_dsp/arm/quantize_neon.c',
 -    'libvpx/vpx_dsp/arm/sad4d_neon.c',
 -    'libvpx/vpx_dsp/arm/sad_neon.c',
 -    'libvpx/vpx_dsp/arm/save_reg_neon.asm',
 -    'libvpx/vpx_dsp/arm/sse_neon.c',
 -    'libvpx/vpx_dsp/arm/subpel_variance_neon.c',
 -    'libvpx/vpx_dsp/arm/subtract_neon.c',
 -    'libvpx/vpx_dsp/arm/sum_squares_neon.c',
 -    'libvpx/vpx_dsp/arm/variance_neon.c',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_avg_horiz_filter_type1_neon.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_avg_horiz_filter_type2_neon.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type1_neon.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_horiz_filter_type1_neon.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_horiz_filter_type2_neon.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_neon_asm.c',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_vert_filter_type1_neon.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve8_vert_filter_type2_neon.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve_avg_neon_asm.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve_copy_neon_asm.asm',
 -    'libvpx/vpx_dsp/arm/vpx_convolve_neon.c',
 -    'libvpx/vpx_dsp/arm/vpx_scaled_convolve8_neon.c',
 -    'libvpx/vpx_dsp/avg.c',
 -    'libvpx/vpx_dsp/bitreader.c',
 -    'libvpx/vpx_dsp/bitreader_buffer.c',
 -    'libvpx/vpx_dsp/bitwriter.c',
 -    'libvpx/vpx_dsp/bitwriter_buffer.c',
 -    'libvpx/vpx_dsp/fwd_txfm.c',
 -    'libvpx/vpx_dsp/intrapred.c',
 -    'libvpx/vpx_dsp/inv_txfm.c',
 -    'libvpx/vpx_dsp/loopfilter.c',
 -    'libvpx/vpx_dsp/prob.c',
 -    'libvpx/vpx_dsp/psnr.c',
 -    'libvpx/vpx_dsp/quantize.c',
 -    'libvpx/vpx_dsp/sad.c',
 -    'libvpx/vpx_dsp/skin_detection.c',
 -    'libvpx/vpx_dsp/sse.c',
 -    'libvpx/vpx_dsp/subtract.c',
 -    'libvpx/vpx_dsp/sum_squares.c',
 -    'libvpx/vpx_dsp/variance.c',
 -    'libvpx/vpx_dsp/vpx_convolve.c',
 -    'libvpx/vpx_dsp/vpx_dsp_rtcd.c',
 -    'libvpx/vpx_mem/vpx_mem.c',
 -    'libvpx/vpx_ports/aarch32_cpudetect.c',
 -    'libvpx/vpx_scale/generic/gen_scalers.c',
 -    'libvpx/vpx_scale/generic/vpx_scale.c',
 -    'libvpx/vpx_scale/generic/yv12config.c',
 -    'libvpx/vpx_scale/generic/yv12extend.c',
 -    'libvpx/vpx_scale/vpx_scale_rtcd.c',
 -    'libvpx/vpx_util/vpx_thread.c',
 -    'libvpx/vpx_util/vpx_write_yuv_frame.c',
+ ],
+   'LINUX_ARM64_EXPORTS': [
+     'libvpx/vpx/vp8.h',
+     'libvpx/vpx/vp8cx.h',
+     'libvpx/vpx/vp8dx.h',
+     'libvpx/vpx/vpx_codec.h',
+     'libvpx/vpx/vpx_decoder.h',
+     'libvpx/vpx/vpx_encoder.h',
+     'libvpx/vpx/vpx_ext_ratectrl.h',
+     'libvpx/vpx/vpx_frame_buffer.h',
+     'libvpx/vpx/vpx_image.h',
+     'libvpx/vpx/vpx_integer.h',
+     'libvpx/vpx/vpx_tpl.h',
+     'libvpx/vpx_mem/include/vpx_mem_intrnl.h',
+     'libvpx/vpx_mem/vpx_mem.h',
+     'libvpx/vpx_ports/arm.h',
+     'libvpx/vpx_ports/arm_cpudetect.h',
+     'libvpx/vpx_ports/bitops.h',
+     'libvpx/vpx_ports/compiler_attributes.h',
+     'libvpx/vpx_ports/mem.h',
+     'libvpx/vpx_ports/static_assert.h',
+     'libvpx/vpx_ports/system_state.h',
+     'libvpx/vpx_ports/vpx_timer.h',
+     'libvpx/vpx_scale/vpx_scale.h',
+     'libvpx/vpx_scale/yv12config.h',
+ ],
+   'LINUX_ARM64_SOURCES': [
+     'libvpx/../config/linux/arm64/vpx_config.c',
+     'libvpx/vp8/common/alloccommon.c',
+     'libvpx/vp8/common/arm/loopfilter_arm.c',
+     'libvpx/vp8/common/arm/neon/bilinearpredict_neon.c',
+     'libvpx/vp8/common/arm/neon/copymem_neon.c',
+     'libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c',
+     'libvpx/vp8/common/arm/neon/dequant_idct_neon.c',
+     'libvpx/vp8/common/arm/neon/dequantizeb_neon.c',
+     'libvpx/vp8/common/arm/neon/idct_blk_neon.c',
+     'libvpx/vp8/common/arm/neon/iwalsh_neon.c',
+     'libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c',
+     'libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c',
+     'libvpx/vp8/common/arm/neon/mbloopfilter_neon.c',
+     'libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c',
+     'libvpx/vp8/common/arm/neon/sixtappredict_neon.c',
+     'libvpx/vp8/common/arm/neon/vp8_loopfilter_neon.c',
+     'libvpx/vp8/common/blockd.c',
+     'libvpx/vp8/common/dequantize.c',
+     'libvpx/vp8/common/entropy.c',
+     'libvpx/vp8/common/entropymode.c',
+     'libvpx/vp8/common/entropymv.c',
+     'libvpx/vp8/common/extend.c',
+     'libvpx/vp8/common/filter.c',
+     'libvpx/vp8/common/findnearmv.c',
+     'libvpx/vp8/common/generic/systemdependent.c',
+     'libvpx/vp8/common/idct_blk.c',
+     'libvpx/vp8/common/idctllm.c',
+     'libvpx/vp8/common/loopfilter_filters.c',
+     'libvpx/vp8/common/mbpitch.c',
+     'libvpx/vp8/common/modecont.c',
+     'libvpx/vp8/common/quant_common.c',
+     'libvpx/vp8/common/reconinter.c',
+     'libvpx/vp8/common/reconintra.c',
+     'libvpx/vp8/common/reconintra4x4.c',
+     'libvpx/vp8/common/rtcd.c',
+     'libvpx/vp8/common/setupintrarecon.c',
+     'libvpx/vp8/common/swapyv12buffer.c',
+     'libvpx/vp8/common/treecoder.c',
+     'libvpx/vp8/common/vp8_loopfilter.c',
+     'libvpx/vp8/common/vp8_skin_detection.c',
+     'libvpx/vp8/decoder/dboolhuff.c',
+     'libvpx/vp8/decoder/decodeframe.c',
+     'libvpx/vp8/decoder/decodemv.c',
+     'libvpx/vp8/decoder/detokenize.c',
+     'libvpx/vp8/decoder/onyxd_if.c',
+     'libvpx/vp8/decoder/threading.c',
+     'libvpx/vp8/encoder/arm/neon/denoising_neon.c',
+     'libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c',
+     'libvpx/vp8/encoder/arm/neon/shortfdct_neon.c',
+     'libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c',
+     'libvpx/vp8/encoder/bitstream.c',
+     'libvpx/vp8/encoder/boolhuff.c',
+     'libvpx/vp8/encoder/copy_c.c',
+     'libvpx/vp8/encoder/dct.c',
+     'libvpx/vp8/encoder/denoising.c',
+     'libvpx/vp8/encoder/encodeframe.c',
+     'libvpx/vp8/encoder/encodeintra.c',
+     'libvpx/vp8/encoder/encodemb.c',
+     'libvpx/vp8/encoder/encodemv.c',
+     'libvpx/vp8/encoder/ethreading.c',
+     'libvpx/vp8/encoder/lookahead.c',
+     'libvpx/vp8/encoder/mcomp.c',
+     'libvpx/vp8/encoder/modecosts.c',
+     'libvpx/vp8/encoder/mr_dissim.c',
+     'libvpx/vp8/encoder/onyx_if.c',
+     'libvpx/vp8/encoder/pickinter.c',
+     'libvpx/vp8/encoder/picklpf.c',
+     'libvpx/vp8/encoder/ratectrl.c',
+     'libvpx/vp8/encoder/rdopt.c',
+     'libvpx/vp8/encoder/segmentation.c',
+     'libvpx/vp8/encoder/tokenize.c',
+     'libvpx/vp8/encoder/treewriter.c',
+     'libvpx/vp8/encoder/vp8_quantize.c',
+     'libvpx/vp8/vp8_cx_iface.c',
+     'libvpx/vp8/vp8_dx_iface.c',
+     'libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c',
+     'libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c',
+     'libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c',
+     'libvpx/vp9/common/vp9_alloccommon.c',
+     'libvpx/vp9/common/vp9_blockd.c',
+     'libvpx/vp9/common/vp9_common_data.c',
+     'libvpx/vp9/common/vp9_entropy.c',
+     'libvpx/vp9/common/vp9_entropymode.c',
+     'libvpx/vp9/common/vp9_entropymv.c',
+     'libvpx/vp9/common/vp9_filter.c',
+     'libvpx/vp9/common/vp9_frame_buffers.c',
+     'libvpx/vp9/common/vp9_idct.c',
+     'libvpx/vp9/common/vp9_loopfilter.c',
+     'libvpx/vp9/common/vp9_mvref_common.c',
+     'libvpx/vp9/common/vp9_pred_common.c',
+     'libvpx/vp9/common/vp9_quant_common.c',
+     'libvpx/vp9/common/vp9_reconinter.c',
+     'libvpx/vp9/common/vp9_reconintra.c',
+     'libvpx/vp9/common/vp9_rtcd.c',
+     'libvpx/vp9/common/vp9_scale.c',
+     'libvpx/vp9/common/vp9_scan.c',
+     'libvpx/vp9/common/vp9_seg_common.c',
+     'libvpx/vp9/common/vp9_thread_common.c',
+     'libvpx/vp9/common/vp9_tile_common.c',
+     'libvpx/vp9/decoder/vp9_decodeframe.c',
+     'libvpx/vp9/decoder/vp9_decodemv.c',
+     'libvpx/vp9/decoder/vp9_decoder.c',
+     'libvpx/vp9/decoder/vp9_detokenize.c',
+     'libvpx/vp9/decoder/vp9_dsubexp.c',
+     'libvpx/vp9/decoder/vp9_job_queue.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_error_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c',
+     'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c',
+     'libvpx/vp9/encoder/vp9_bitstream.c',
+     'libvpx/vp9/encoder/vp9_context_tree.c',
+     'libvpx/vp9/encoder/vp9_cost.c',
+     'libvpx/vp9/encoder/vp9_dct.c',
+     'libvpx/vp9/encoder/vp9_encodeframe.c',
+     'libvpx/vp9/encoder/vp9_encodemb.c',
+     'libvpx/vp9/encoder/vp9_encodemv.c',
+     'libvpx/vp9/encoder/vp9_encoder.c',
+     'libvpx/vp9/encoder/vp9_ethread.c',
+     'libvpx/vp9/encoder/vp9_ext_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_extend.c',
+     'libvpx/vp9/encoder/vp9_frame_scale.c',
+     'libvpx/vp9/encoder/vp9_lookahead.c',
+     'libvpx/vp9/encoder/vp9_mcomp.c',
+     'libvpx/vp9/encoder/vp9_multi_thread.c',
+     'libvpx/vp9/encoder/vp9_noise_estimate.c',
+     'libvpx/vp9/encoder/vp9_picklpf.c',
+     'libvpx/vp9/encoder/vp9_pickmode.c',
+     'libvpx/vp9/encoder/vp9_quantize.c',
+     'libvpx/vp9/encoder/vp9_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_rd.c',
+     'libvpx/vp9/encoder/vp9_rdopt.c',
+     'libvpx/vp9/encoder/vp9_resize.c',
+     'libvpx/vp9/encoder/vp9_segmentation.c',
+     'libvpx/vp9/encoder/vp9_skin_detection.c',
+     'libvpx/vp9/encoder/vp9_speed_features.c',
+     'libvpx/vp9/encoder/vp9_subexp.c',
+     'libvpx/vp9/encoder/vp9_svc_layercontext.c',
+     'libvpx/vp9/encoder/vp9_tokenize.c',
+     'libvpx/vp9/encoder/vp9_tpl_model.c',
+     'libvpx/vp9/encoder/vp9_treewriter.c',
+     'libvpx/vp9/vp9_cx_iface.c',
+     'libvpx/vp9/vp9_dx_iface.c',
+     'libvpx/vp9/vp9_iface_common.c',
+     'libvpx/vpx/src/vpx_codec.c',
+     'libvpx/vpx/src/vpx_decoder.c',
+     'libvpx/vpx/src/vpx_encoder.c',
+     'libvpx/vpx/src/vpx_image.c',
+     'libvpx/vpx_dsp/arm/avg_neon.c',
+     'libvpx/vpx_dsp/arm/avg_pred_neon.c',
+     'libvpx/vpx_dsp/arm/fdct16x16_neon.c',
+     'libvpx/vpx_dsp/arm/fdct32x32_neon.c',
+     'libvpx/vpx_dsp/arm/fdct4x4_neon.c',
+     'libvpx/vpx_dsp/arm/fdct8x8_neon.c',
+     'libvpx/vpx_dsp/arm/fdct_partial_neon.c',
+     'libvpx/vpx_dsp/arm/hadamard_neon.c',
+     'libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct16x16_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct32x32_135_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct32x32_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct4x4_1_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct4x4_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct8x8_1_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct8x8_add_neon.c',
+     'libvpx/vpx_dsp/arm/intrapred_neon.c',
+     'libvpx/vpx_dsp/arm/loopfilter_neon.c',
+     'libvpx/vpx_dsp/arm/quantize_neon.c',
+     'libvpx/vpx_dsp/arm/sad4d_neon.c',
+     'libvpx/vpx_dsp/arm/sad4d_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/sad_neon.c',
+     'libvpx/vpx_dsp/arm/sad_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/sse_neon.c',
+     'libvpx/vpx_dsp/arm/sse_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/subpel_variance_neon.c',
+     'libvpx/vpx_dsp/arm/subtract_neon.c',
+     'libvpx/vpx_dsp/arm/sum_squares_neon.c',
+     'libvpx/vpx_dsp/arm/variance_neon.c',
+     'libvpx/vpx_dsp/arm/variance_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve8_neon.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve8_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve8_neon_i8mm.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve_avg_neon.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve_copy_neon.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve_neon.c',
+     'libvpx/vpx_dsp/arm/vpx_scaled_convolve8_neon.c',
+     'libvpx/vpx_dsp/avg.c',
+     'libvpx/vpx_dsp/bitreader.c',
+     'libvpx/vpx_dsp/bitreader_buffer.c',
+     'libvpx/vpx_dsp/bitwriter.c',
+     'libvpx/vpx_dsp/bitwriter_buffer.c',
+     'libvpx/vpx_dsp/fwd_txfm.c',
+     'libvpx/vpx_dsp/intrapred.c',
+     'libvpx/vpx_dsp/inv_txfm.c',
+     'libvpx/vpx_dsp/loopfilter.c',
+     'libvpx/vpx_dsp/prob.c',
+     'libvpx/vpx_dsp/psnr.c',
+     'libvpx/vpx_dsp/quantize.c',
+     'libvpx/vpx_dsp/sad.c',
+     'libvpx/vpx_dsp/skin_detection.c',
+     'libvpx/vpx_dsp/sse.c',
+     'libvpx/vpx_dsp/subtract.c',
+     'libvpx/vpx_dsp/sum_squares.c',
+     'libvpx/vpx_dsp/variance.c',
+     'libvpx/vpx_dsp/vpx_convolve.c',
+     'libvpx/vpx_dsp/vpx_dsp_rtcd.c',
+     'libvpx/vpx_mem/vpx_mem.c',
+     'libvpx/vpx_ports/aarch64_cpudetect.c',
+     'libvpx/vpx_scale/generic/gen_scalers.c',
+     'libvpx/vpx_scale/generic/vpx_scale.c',
+     'libvpx/vpx_scale/generic/yv12config.c',
+     'libvpx/vpx_scale/generic/yv12extend.c',
+     'libvpx/vpx_scale/vpx_scale_rtcd.c',
+     'libvpx/vpx_util/vpx_thread.c',
+     'libvpx/vpx_util/vpx_write_yuv_frame.c',
+ ],
+   'MAC_ARM64_EXPORTS': [
+     'libvpx/vpx/vp8.h',
+     'libvpx/vpx/vp8cx.h',
+     'libvpx/vpx/vp8dx.h',
+     'libvpx/vpx/vpx_codec.h',
+     'libvpx/vpx/vpx_decoder.h',
+     'libvpx/vpx/vpx_encoder.h',
+     'libvpx/vpx/vpx_ext_ratectrl.h',
+     'libvpx/vpx/vpx_frame_buffer.h',
+     'libvpx/vpx/vpx_image.h',
+     'libvpx/vpx/vpx_integer.h',
+     'libvpx/vpx/vpx_tpl.h',
+     'libvpx/vpx_mem/include/vpx_mem_intrnl.h',
+     'libvpx/vpx_mem/vpx_mem.h',
+     'libvpx/vpx_ports/arm.h',
+     'libvpx/vpx_ports/arm_cpudetect.h',
+     'libvpx/vpx_ports/bitops.h',
+     'libvpx/vpx_ports/compiler_attributes.h',
+     'libvpx/vpx_ports/mem.h',
+     'libvpx/vpx_ports/static_assert.h',
+     'libvpx/vpx_ports/system_state.h',
+     'libvpx/vpx_ports/vpx_timer.h',
+     'libvpx/vpx_scale/vpx_scale.h',
+     'libvpx/vpx_scale/yv12config.h',
+ ],
+   'MAC_ARM64_SOURCES': [
+     'libvpx/../config/mac/arm64/vpx_config.c',
+     'libvpx/vp8/common/alloccommon.c',
+     'libvpx/vp8/common/arm/loopfilter_arm.c',
+     'libvpx/vp8/common/arm/neon/bilinearpredict_neon.c',
+     'libvpx/vp8/common/arm/neon/copymem_neon.c',
+     'libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c',
+     'libvpx/vp8/common/arm/neon/dequant_idct_neon.c',
+     'libvpx/vp8/common/arm/neon/dequantizeb_neon.c',
+     'libvpx/vp8/common/arm/neon/idct_blk_neon.c',
+     'libvpx/vp8/common/arm/neon/iwalsh_neon.c',
+     'libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c',
+     'libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c',
+     'libvpx/vp8/common/arm/neon/mbloopfilter_neon.c',
+     'libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c',
+     'libvpx/vp8/common/arm/neon/sixtappredict_neon.c',
+     'libvpx/vp8/common/arm/neon/vp8_loopfilter_neon.c',
+     'libvpx/vp8/common/blockd.c',
+     'libvpx/vp8/common/dequantize.c',
+     'libvpx/vp8/common/entropy.c',
+     'libvpx/vp8/common/entropymode.c',
+     'libvpx/vp8/common/entropymv.c',
+     'libvpx/vp8/common/extend.c',
+     'libvpx/vp8/common/filter.c',
+     'libvpx/vp8/common/findnearmv.c',
+     'libvpx/vp8/common/generic/systemdependent.c',
+     'libvpx/vp8/common/idct_blk.c',
+     'libvpx/vp8/common/idctllm.c',
+     'libvpx/vp8/common/loopfilter_filters.c',
+     'libvpx/vp8/common/mbpitch.c',
+     'libvpx/vp8/common/modecont.c',
+     'libvpx/vp8/common/quant_common.c',
+     'libvpx/vp8/common/reconinter.c',
+     'libvpx/vp8/common/reconintra.c',
+     'libvpx/vp8/common/reconintra4x4.c',
+     'libvpx/vp8/common/rtcd.c',
+     'libvpx/vp8/common/setupintrarecon.c',
+     'libvpx/vp8/common/swapyv12buffer.c',
+     'libvpx/vp8/common/treecoder.c',
+     'libvpx/vp8/common/vp8_loopfilter.c',
+     'libvpx/vp8/common/vp8_skin_detection.c',
+     'libvpx/vp8/decoder/dboolhuff.c',
+     'libvpx/vp8/decoder/decodeframe.c',
+     'libvpx/vp8/decoder/decodemv.c',
+     'libvpx/vp8/decoder/detokenize.c',
+     'libvpx/vp8/decoder/onyxd_if.c',
+     'libvpx/vp8/decoder/threading.c',
+     'libvpx/vp8/encoder/arm/neon/denoising_neon.c',
+     'libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c',
+     'libvpx/vp8/encoder/arm/neon/shortfdct_neon.c',
+     'libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c',
+     'libvpx/vp8/encoder/bitstream.c',
+     'libvpx/vp8/encoder/boolhuff.c',
+     'libvpx/vp8/encoder/copy_c.c',
+     'libvpx/vp8/encoder/dct.c',
+     'libvpx/vp8/encoder/denoising.c',
+     'libvpx/vp8/encoder/encodeframe.c',
+     'libvpx/vp8/encoder/encodeintra.c',
+     'libvpx/vp8/encoder/encodemb.c',
+     'libvpx/vp8/encoder/encodemv.c',
+     'libvpx/vp8/encoder/ethreading.c',
+     'libvpx/vp8/encoder/firstpass.c',
+     'libvpx/vp8/encoder/lookahead.c',
+     'libvpx/vp8/encoder/mcomp.c',
+     'libvpx/vp8/encoder/modecosts.c',
+     'libvpx/vp8/encoder/mr_dissim.c',
+     'libvpx/vp8/encoder/onyx_if.c',
+     'libvpx/vp8/encoder/pickinter.c',
+     'libvpx/vp8/encoder/picklpf.c',
+     'libvpx/vp8/encoder/ratectrl.c',
+     'libvpx/vp8/encoder/rdopt.c',
+     'libvpx/vp8/encoder/segmentation.c',
+     'libvpx/vp8/encoder/temporal_filter.c',
+     'libvpx/vp8/encoder/tokenize.c',
+     'libvpx/vp8/encoder/treewriter.c',
+     'libvpx/vp8/encoder/vp8_quantize.c',
+     'libvpx/vp8/vp8_cx_iface.c',
+     'libvpx/vp8/vp8_dx_iface.c',
+     'libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c',
+     'libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c',
+     'libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c',
+     'libvpx/vp9/common/vp9_alloccommon.c',
+     'libvpx/vp9/common/vp9_blockd.c',
+     'libvpx/vp9/common/vp9_common_data.c',
+     'libvpx/vp9/common/vp9_entropy.c',
+     'libvpx/vp9/common/vp9_entropymode.c',
+     'libvpx/vp9/common/vp9_entropymv.c',
+     'libvpx/vp9/common/vp9_filter.c',
+     'libvpx/vp9/common/vp9_frame_buffers.c',
+     'libvpx/vp9/common/vp9_idct.c',
+     'libvpx/vp9/common/vp9_loopfilter.c',
+     'libvpx/vp9/common/vp9_mvref_common.c',
+     'libvpx/vp9/common/vp9_pred_common.c',
+     'libvpx/vp9/common/vp9_quant_common.c',
+     'libvpx/vp9/common/vp9_reconinter.c',
+     'libvpx/vp9/common/vp9_reconintra.c',
+     'libvpx/vp9/common/vp9_rtcd.c',
+     'libvpx/vp9/common/vp9_scale.c',
+     'libvpx/vp9/common/vp9_scan.c',
+     'libvpx/vp9/common/vp9_seg_common.c',
+     'libvpx/vp9/common/vp9_thread_common.c',
+     'libvpx/vp9/common/vp9_tile_common.c',
+     'libvpx/vp9/decoder/vp9_decodeframe.c',
+     'libvpx/vp9/decoder/vp9_decodemv.c',
+     'libvpx/vp9/decoder/vp9_decoder.c',
+     'libvpx/vp9/decoder/vp9_detokenize.c',
+     'libvpx/vp9/decoder/vp9_dsubexp.c',
+     'libvpx/vp9/decoder/vp9_job_queue.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_error_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_error_sve.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c',
+     'libvpx/vp9/encoder/arm/neon/vp9_temporal_filter_neon.c',
+     'libvpx/vp9/encoder/vp9_alt_ref_aq.c',
+     'libvpx/vp9/encoder/vp9_aq_360.c',
+     'libvpx/vp9/encoder/vp9_aq_complexity.c',
+     'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c',
+     'libvpx/vp9/encoder/vp9_aq_variance.c',
+     'libvpx/vp9/encoder/vp9_bitstream.c',
+     'libvpx/vp9/encoder/vp9_context_tree.c',
+     'libvpx/vp9/encoder/vp9_cost.c',
+     'libvpx/vp9/encoder/vp9_dct.c',
+     'libvpx/vp9/encoder/vp9_encodeframe.c',
+     'libvpx/vp9/encoder/vp9_encodemb.c',
+     'libvpx/vp9/encoder/vp9_encodemv.c',
+     'libvpx/vp9/encoder/vp9_encoder.c',
+     'libvpx/vp9/encoder/vp9_ethread.c',
+     'libvpx/vp9/encoder/vp9_ext_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_extend.c',
+     'libvpx/vp9/encoder/vp9_firstpass.c',
+     'libvpx/vp9/encoder/vp9_frame_scale.c',
+     'libvpx/vp9/encoder/vp9_lookahead.c',
+     'libvpx/vp9/encoder/vp9_mbgraph.c',
+     'libvpx/vp9/encoder/vp9_mcomp.c',
+     'libvpx/vp9/encoder/vp9_multi_thread.c',
+     'libvpx/vp9/encoder/vp9_noise_estimate.c',
+     'libvpx/vp9/encoder/vp9_picklpf.c',
+     'libvpx/vp9/encoder/vp9_pickmode.c',
+     'libvpx/vp9/encoder/vp9_quantize.c',
+     'libvpx/vp9/encoder/vp9_ratectrl.c',
+     'libvpx/vp9/encoder/vp9_rd.c',
+     'libvpx/vp9/encoder/vp9_rdopt.c',
+     'libvpx/vp9/encoder/vp9_resize.c',
+     'libvpx/vp9/encoder/vp9_segmentation.c',
+     'libvpx/vp9/encoder/vp9_skin_detection.c',
+     'libvpx/vp9/encoder/vp9_speed_features.c',
+     'libvpx/vp9/encoder/vp9_subexp.c',
+     'libvpx/vp9/encoder/vp9_svc_layercontext.c',
+     'libvpx/vp9/encoder/vp9_temporal_filter.c',
+     'libvpx/vp9/encoder/vp9_tokenize.c',
+     'libvpx/vp9/encoder/vp9_tpl_model.c',
+     'libvpx/vp9/encoder/vp9_treewriter.c',
+     'libvpx/vp9/vp9_cx_iface.c',
+     'libvpx/vp9/vp9_dx_iface.c',
+     'libvpx/vp9/vp9_iface_common.c',
+     'libvpx/vpx/src/vpx_codec.c',
+     'libvpx/vpx/src/vpx_decoder.c',
+     'libvpx/vpx/src/vpx_encoder.c',
+     'libvpx/vpx/src/vpx_image.c',
+     'libvpx/vpx_dsp/arm/avg_neon.c',
+     'libvpx/vpx_dsp/arm/avg_pred_neon.c',
+     'libvpx/vpx_dsp/arm/fdct16x16_neon.c',
+     'libvpx/vpx_dsp/arm/fdct32x32_neon.c',
+     'libvpx/vpx_dsp/arm/fdct4x4_neon.c',
+     'libvpx/vpx_dsp/arm/fdct8x8_neon.c',
+     'libvpx/vpx_dsp/arm/fdct_partial_neon.c',
+     'libvpx/vpx_dsp/arm/hadamard_neon.c',
+     'libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct16x16_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct32x32_135_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct32x32_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct4x4_1_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct4x4_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct8x8_1_add_neon.c',
+     'libvpx/vpx_dsp/arm/idct8x8_add_neon.c',
+     'libvpx/vpx_dsp/arm/intrapred_neon.c',
+     'libvpx/vpx_dsp/arm/loopfilter_neon.c',
+     'libvpx/vpx_dsp/arm/quantize_neon.c',
+     'libvpx/vpx_dsp/arm/sad4d_neon.c',
+     'libvpx/vpx_dsp/arm/sad4d_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/sad_neon.c',
+     'libvpx/vpx_dsp/arm/sad_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/sse_neon.c',
+     'libvpx/vpx_dsp/arm/sse_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/subpel_variance_neon.c',
+     'libvpx/vpx_dsp/arm/subtract_neon.c',
+     'libvpx/vpx_dsp/arm/sum_squares_neon.c',
+     'libvpx/vpx_dsp/arm/sum_squares_sve.c',
+     'libvpx/vpx_dsp/arm/variance_neon.c',
+     'libvpx/vpx_dsp/arm/variance_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve8_neon.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve8_neon_dotprod.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve8_neon_i8mm.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve_avg_neon.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve_copy_neon.c',
+     'libvpx/vpx_dsp/arm/vpx_convolve_neon.c',
+     'libvpx/vpx_dsp/arm/vpx_scaled_convolve8_neon.c',
+     'libvpx/vpx_dsp/avg.c',
+     'libvpx/vpx_dsp/bitreader.c',
+     'libvpx/vpx_dsp/bitreader_buffer.c',
+     'libvpx/vpx_dsp/bitwriter.c',
+     'libvpx/vpx_dsp/bitwriter_buffer.c',
+     'libvpx/vpx_dsp/fwd_txfm.c',
+     'libvpx/vpx_dsp/intrapred.c',
+     'libvpx/vpx_dsp/inv_txfm.c',
+     'libvpx/vpx_dsp/loopfilter.c',
+     'libvpx/vpx_dsp/prob.c',
+     'libvpx/vpx_dsp/psnr.c',
+     'libvpx/vpx_dsp/quantize.c',
+     'libvpx/vpx_dsp/sad.c',
+     'libvpx/vpx_dsp/skin_detection.c',
+     'libvpx/vpx_dsp/sse.c',
+     'libvpx/vpx_dsp/subtract.c',
+     'libvpx/vpx_dsp/sum_squares.c',
+     'libvpx/vpx_dsp/variance.c',
+     'libvpx/vpx_dsp/vpx_convolve.c',
+     'libvpx/vpx_dsp/vpx_dsp_rtcd.c',
+     'libvpx/vpx_mem/vpx_mem.c',
+     'libvpx/vpx_ports/aarch64_cpudetect.c',
      'libvpx/vpx_scale/generic/gen_scalers.c',
      'libvpx/vpx_scale/generic/vpx_scale.c',
      'libvpx/vpx_scale/generic/yv12config.c',

diff --cc modules/fdlibm/src/math_private.h
Simple merge

diff --cc mozglue/build/arm.h
Simple merge

diff --cc third_party/aom/aom_dsp/aom_dsp.cmake
index b13500417ce69d360541d7765bc16f9e456f8f7e,6d8e5a961b554e2b677ec2ca726645a19c3bd1e5..aaa73e20232c2bab581324b8a6279bb91c41c00d
--- 1/third_party/aom/aom_dsp/aom_dsp.cmake
--- 2/third_party/aom/aom_dsp/aom_dsp.cmake
+++ b/third_party/aom/aom_dsp/aom_dsp.cmake
@@@ -91,40 -96,55 +96,55 @@@ list(APPEND AOM_DSP_COMMON_INTRIN_AVX
              "${AOM_ROOT}/aom_dsp/x86/txfm_common_avx2.h"
              "${AOM_ROOT}/aom_dsp/x86/convolve_avx2.h"
              "${AOM_ROOT}/aom_dsp/x86/fft_avx2.c"
-             "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_avx2.c"
-             "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_avx2.c"
              "${AOM_ROOT}/aom_dsp/x86/intrapred_avx2.c"
-             "${AOM_ROOT}/aom_dsp/x86/blend_a64_mask_avx2.c")
+             "${AOM_ROOT}/aom_dsp/x86/loopfilter_avx2.c"
+             "${AOM_ROOT}/aom_dsp/x86/blend_a64_mask_avx2.c"
+             "${AOM_ROOT}/aom_dsp/x86/bitdepth_conversion_avx2.h"
+             "${AOM_ROOT}/third_party/SVT-AV1/convolve_2d_avx2.h"
+             "${AOM_ROOT}/third_party/SVT-AV1/convolve_avx2.h"
+             "${AOM_ROOT}/third_party/SVT-AV1/EbMemory_AVX2.h"
+             "${AOM_ROOT}/third_party/SVT-AV1/EbMemory_SSE4_1.h"
+             "${AOM_ROOT}/third_party/SVT-AV1/synonyms.h")
  
 -list(APPEND AOM_DSP_COMMON_INTRIN_NEON
 -            "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/subtract_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/avg_pred_neon.c")
 +#list(APPEND AOM_DSP_COMMON_INTRIN_NEON
++#            "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c"
++#            "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/subtract_neon.c"
- #            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c")
- 
- list(APPEND AOM_DSP_COMMON_INTRIN_DSPR2
-             "${AOM_ROOT}/aom_dsp/mips/common_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/common_dspr2.h"
-             "${AOM_ROOT}/aom_dsp/mips/convolve2_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/convolve2_horiz_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/convolve2_vert_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/convolve8_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/convolve8_horiz_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/convolve8_vert_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/convolve_common_dspr2.h"
-             "${AOM_ROOT}/aom_dsp/mips/intrapred16_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/intrapred4_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/intrapred8_dspr2.c"
-             "${AOM_ROOT}/aom_dsp/mips/inv_txfm_dspr2.h")
- 
- list(APPEND AOM_DSP_COMMON_INTRIN_MSA
-             "${AOM_ROOT}/aom_dsp/mips/aom_convolve8_horiz_msa.c"
-             "${AOM_ROOT}/aom_dsp/mips/aom_convolve8_vert_msa.c"
-             "${AOM_ROOT}/aom_dsp/mips/aom_convolve_copy_msa.c"
-             "${AOM_ROOT}/aom_dsp/mips/aom_convolve_msa.h"
-             "${AOM_ROOT}/aom_dsp/mips/intrapred_msa.c"
-             "${AOM_ROOT}/aom_dsp/mips/macros_msa.h")
++#            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c"
++#            "${AOM_ROOT}/aom_dsp/arm/avg_pred_neon.c")
+ 
+ list(APPEND AOM_DSP_COMMON_INTRIN_NEON_DOTPROD
+             "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_dotprod.c")
+ 
+ list(APPEND AOM_DSP_COMMON_INTRIN_NEON_I8MM
+             "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_i8mm.c")
+ 
+ if(CONFIG_AV1_HIGHBITDEPTH)
+   list(APPEND AOM_DSP_COMMON_INTRIN_SSE2
+               "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_sse2.c"
+               "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_sse2.c")
+ 
+   list(APPEND AOM_DSP_COMMON_INTRIN_SSSE3
+               "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_ssse3.c")
+ 
+   list(APPEND AOM_DSP_COMMON_INTRIN_AVX2
+               "${AOM_ROOT}/aom_dsp/x86/highbd_convolve_avx2.c"
+               "${AOM_ROOT}/aom_dsp/x86/highbd_loopfilter_avx2.c")
+ 
+   list(APPEND AOM_DSP_COMMON_INTRIN_NEON
+               "${AOM_ROOT}/aom_dsp/arm/highbd_blend_a64_hmask_neon.c"
+               "${AOM_ROOT}/aom_dsp/arm/highbd_blend_a64_mask_neon.c"
+               "${AOM_ROOT}/aom_dsp/arm/highbd_blend_a64_vmask_neon.c"
+               "${AOM_ROOT}/aom_dsp/arm/highbd_convolve8_neon.c"
+               "${AOM_ROOT}/aom_dsp/arm/highbd_intrapred_neon.c"
+               "${AOM_ROOT}/aom_dsp/arm/highbd_loopfilter_neon.c")
+ 
+   list(APPEND AOM_DSP_COMMON_INTRIN_SVE
+               "${AOM_ROOT}/aom_dsp/arm/highbd_convolve8_sve.c")
+ endif()
  
  if(CONFIG_AV1_DECODER)
    list(APPEND AOM_DSP_DECODER_SOURCES