Bug 1530659 - Always pass -Isilk/fixed to unbreak on aarch64 after bug 1522016. r=glandium
authorJan Beich <jbeich@FreeBSD.org>
Tue, 19 Mar 2019 22:00:40 +0000
changeset 466520 40dadf4cbcccd115d57b8cdeb8c51b5e68c0a6fe
parent 466519 3e86fd84509e47980f488c52fd0e80e3cf811606
child 466521 45b6106522b51876be86d68b0be398da02f84b19
push id35769
push useropoprus@mozilla.com
push dateThu, 28 Mar 2019 10:12:29 +0000
treeherdermozilla-central@d2c82f845bfc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1530659, 1522016
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1530659 - Always pass -Isilk/fixed to unbreak on aarch64 after bug 1522016. r=glandium
media/libopus/moz.build
--- a/media/libopus/moz.build
+++ b/media/libopus/moz.build
@@ -58,38 +58,34 @@ if CONFIG['OS_ARCH'] == 'SunOS':
 if not CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
     DEFINES['FIXED_POINT'] = 1
     DEFINES['DISABLE_FLOAT_API'] = True
 
 LOCAL_INCLUDES += [
     'celt',
     'include',
     'silk',
+    'silk/fixed',
+    'silk/float',
     'src',
 ]
 
 # sources.mozbuild is generated from gen-sources.py when a new libopus is
 # imported.
 include('sources.mozbuild')
 
 UNIFIED_SOURCES += celt_sources
 UNIFIED_SOURCES += silk_sources
 UNIFIED_SOURCES += opus_sources
 SOURCES += opus_nonunified_sources
 
 if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
-    LOCAL_INCLUDES += [
-        'silk/float',
-    ]
     UNIFIED_SOURCES += silk_sources_float
     UNIFIED_SOURCES += opus_sources_float
 else:
-    LOCAL_INCLUDES += [
-        'silk/fixed',
-    ]
     UNIFIED_SOURCES += silk_sources_fixed
 
 if CONFIG['CPU_ARCH'] in ('x86', 'x86_64'):
     DEFINES['OPUS_HAVE_RTCD'] = True
     DEFINES['OPUS_X86_MAY_HAVE_SSE'] = True
     DEFINES['OPUS_X86_MAY_HAVE_SSE2'] = True
     DEFINES['OPUS_X86_MAY_HAVE_SSE4_1'] = True
     DEFINES['OPUS_X86_MAY_HAVE_AVX'] = True