Bug 1337250 - Fix libvpx build on non-Android ARM. r=froydnj

--HG--
extra : rebase_source : 5c0c59e680a79714872bf970a35e028c2bebef7f
This commit is contained in:
Mike Hommey 2017-02-07 13:55:08 +09:00
parent a577c3191e
commit d340c6b1f2

View File

@ -39,7 +39,10 @@ elif CONFIG['CPU_ARCH'] == 'x86':
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']
@ -88,8 +91,6 @@ if CONFIG['OS_TARGET'] == 'Android':
'%%%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'):