Bug 1337250 - Fix libvpx build on non-Android ARM. r?froydnj
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -34,17 +34,20 @@ elif CONFIG['CPU_ARCH'] == 'x86':
elif CONFIG['OS_TARGET'] == 'Darwin':
ASFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ]
else: # Android, Linux, BSDs, etc.
ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
elif CONFIG['CPU_ARCH'] == 'arm':
EXPORTS.vpx += files['ARM_EXPORTS']
- ASFLAGS += [ '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR ]
+ ASFLAGS += [
+ '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR,
+ '-I%s/libvpx' % OBJDIR,
+ ]
CFLAGS += [ '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR ]
arm_asm_files = files['ARM_SOURCES']
if CONFIG['VPX_AS_CONVERSION']:
SOURCES += sorted([
"!%s.S" % f if f.endswith('.asm') else f for f in arm_asm_files
])
@@ -83,18 +86,16 @@ if CONFIG['OS_TARGET'] == 'Android':
# the OS they're on, so do it for them.
DEFINES['__linux__'] = True
if not CONFIG['MOZ_WEBRTC']:
SOURCES += [
'%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
]
- ASFLAGS += ['-I%s/libvpx' % OBJDIR]
-
if CONFIG['CLANG_CL'] or not CONFIG['_MSC_VER']:
for f in SOURCES:
if f.endswith('.c'):
if 'sse2.c' in f:
SOURCES[f].flags += CONFIG['SSE2_FLAGS']
if 'ssse3.c' in f:
SOURCES[f].flags += ['-mssse3']
if 'sse4.c' in f: