Bug 1691975: Undo autovendored sources from libdav1d r=mhentges

Differential Revision: https://phabricator.services.mozilla.com/D104753

media/libdav1d/asm/autovendored_sources.mozbuild

@@ -1,12 +0,0 @@
-sources = [
-'../../../third_party/dav1d/src/x86/cdef16_sse.asm',
-'../../../third_party/dav1d/src/x86/cdef_sse.asm',
-'../../../third_party/dav1d/src/x86/cpuid.asm',
-'../../../third_party/dav1d/src/x86/film_grain_ssse3.asm',
-'../../../third_party/dav1d/src/x86/ipred_ssse3.asm',
-'../../../third_party/dav1d/src/x86/itx_ssse3.asm',
-'../../../third_party/dav1d/src/x86/loopfilter_ssse3.asm',
-'../../../third_party/dav1d/src/x86/looprestoration_sse.asm',
-'../../../third_party/dav1d/src/x86/mc_sse.asm',
-'../../../third_party/dav1d/src/x86/msac.asm',
-]

media/libdav1d/asm/moz.build

@@ -96,8 +96,18 @@ if CONFIG['CPU_ARCH'] in ('x86', 'x86_64'):
             '../../../third_party/dav1d/src/x86/mc_avx512.asm',
         ]
 
-    include('autovendored_sources.mozbuild')
-    SOURCES += sources
+    SOURCES += [
+        '../../../third_party/dav1d/src/x86/cdef16_sse.asm',
+        '../../../third_party/dav1d/src/x86/cdef_sse.asm',
+        '../../../third_party/dav1d/src/x86/cpuid.asm',
+        '../../../third_party/dav1d/src/x86/film_grain_ssse3.asm',
+        '../../../third_party/dav1d/src/x86/ipred_ssse3.asm',
+        '../../../third_party/dav1d/src/x86/itx_ssse3.asm',
+        '../../../third_party/dav1d/src/x86/loopfilter_ssse3.asm',
+        '../../../third_party/dav1d/src/x86/looprestoration_sse.asm',
+        '../../../third_party/dav1d/src/x86/mc_sse.asm',
+        '../../../third_party/dav1d/src/x86/msac.asm',
+    ]
 
     # BITDEPTH
     relative_path = '../../../third_party/dav1d/src/x86/'

media/libdav1d/autovendored_sources.mozbuild

@@ -1,23 +0,0 @@
-sources = [
-    '../../third_party/dav1d/src/cdf.c',
-    '../../third_party/dav1d/src/cpu.c',
-    '../../third_party/dav1d/src/data.c',
-    '../../third_party/dav1d/src/decode.c',
-    '../../third_party/dav1d/src/dequant_tables.c',
-    '../../third_party/dav1d/src/getbits.c',
-    '../../third_party/dav1d/src/intra_edge.c',
-    '../../third_party/dav1d/src/itx_1d.c',
-    '../../third_party/dav1d/src/lf_mask.c',
-    '../../third_party/dav1d/src/log.c',
-    '../../third_party/dav1d/src/mem.c',
-    '../../third_party/dav1d/src/msac.c',
-    '../../third_party/dav1d/src/obu.c',
-    '../../third_party/dav1d/src/picture.c',
-    '../../third_party/dav1d/src/qm.c',
-    '../../third_party/dav1d/src/ref.c',
-    '../../third_party/dav1d/src/refmvs.c',
-    '../../third_party/dav1d/src/scan.c',
-    '../../third_party/dav1d/src/tables.c',
-    '../../third_party/dav1d/src/warpmv.c',
-    '../../third_party/dav1d/src/wedge.c',
-]

media/libdav1d/moz.build

@@ -71,8 +71,29 @@ if CONFIG['OS_TARGET'] == 'Linux':
         ]
 
 # common sources
-include('autovendored_sources.mozbuild')
-SOURCES += sources
+SOURCES += [
+    '../../third_party/dav1d/src/cdf.c',
+    '../../third_party/dav1d/src/cpu.c',
+    '../../third_party/dav1d/src/data.c',
+    '../../third_party/dav1d/src/decode.c',
+    '../../third_party/dav1d/src/dequant_tables.c',
+    '../../third_party/dav1d/src/getbits.c',
+    '../../third_party/dav1d/src/intra_edge.c',
+    '../../third_party/dav1d/src/itx_1d.c',
+    '../../third_party/dav1d/src/lf_mask.c',
+    '../../third_party/dav1d/src/log.c',
+    '../../third_party/dav1d/src/mem.c',
+    '../../third_party/dav1d/src/msac.c',
+    '../../third_party/dav1d/src/obu.c',
+    '../../third_party/dav1d/src/picture.c',
+    '../../third_party/dav1d/src/qm.c',
+    '../../third_party/dav1d/src/ref.c',
+    '../../third_party/dav1d/src/refmvs.c',
+    '../../third_party/dav1d/src/scan.c',
+    '../../third_party/dav1d/src/tables.c',
+    '../../third_party/dav1d/src/warpmv.c',
+    '../../third_party/dav1d/src/wedge.c',
+]
 
 # includes src
 EXPORTS.dav1d.src += [

media/libdav1d/test/fuzztest/autovendored_sources.mozbuild

@@ -1,4 +0,0 @@
-sources = [
-'/third_party/dav1d/tests/libfuzzer/dav1d_fuzzer.c',
-'dav1d_fuzz_adapter.cpp',
-]

media/libdav1d/test/fuzztest/moz.build

@@ -24,8 +24,10 @@ elif CONFIG['CPU_ARCH'] == 'x86':
         '/media/libdav1d/asm/x86_32/',
     ]
 
-include('autovendored_sources.mozbuild')
-SOURCES += sources
+SOURCES += [
+    '/third_party/dav1d/tests/libfuzzer/dav1d_fuzzer.c',
+    'dav1d_fuzz_adapter.cpp',
+]
 
 include('/tools/fuzzing/libfuzzer-config.mozbuild')