# HG changeset patch
# User Jan Beich <jbeich@FreeBSD.org>
# Date 1553032840 0
#      Tue Mar 19 22:00:40 2019 +0000
# Node ID 40dadf4cbcccd115d57b8cdeb8c51b5e68c0a6fe
# Parent  3e86fd84509e47980f488c52fd0e80e3cf811606
Bug 1530659 - Always pass -Isilk/fixed to unbreak on aarch64 after bug 1522016. r=glandium

diff --git a/media/libopus/moz.build b/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