Bug 1380118 - Export aom_config.h.
Recent changes made this a public header, so it needs to be
available to callers like AOMDecoder.
MozReview-Commit-ID: KKXcv8bdVYj
--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -12,39 +12,45 @@ include('sources.mozbuild')
# Linux, Mac and Win share file lists for x86* but not configurations.
if CONFIG['CPU_ARCH'] == 'x86_64':
EXPORTS.aom += files['X64_EXPORTS']
SOURCES += files['X64_SOURCES']
USE_YASM = True
if CONFIG['OS_TARGET'] == 'WINNT':
ASFLAGS += [ '-I%s/media/libaom/config/win/x64/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/win/x64/' % TOPSRCDIR ]
+ EXPORTS.aom += [ 'config/win/x64/aom_config.h' ]
elif CONFIG['OS_TARGET'] == 'Darwin':
ASFLAGS += [ '-I%s/media/libaom/config/mac/x64/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/mac/x64/' % TOPSRCDIR ]
+ EXPORTS.aom += [ 'config/mac/x64/aom_config.h' ]
else: # Android, Linux, BSDs, etc.
ASFLAGS += [ '-I%s/media/libaom/config/linux/x64/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/linux/x64/' % TOPSRCDIR ]
+ EXPORTS.aom += [ 'config/linux/x64/aom_config.h' ]
elif CONFIG['CPU_ARCH'] == 'x86':
EXPORTS.aom += files['IA32_EXPORTS']
SOURCES += files['IA32_SOURCES']
USE_YASM = True
if CONFIG['OS_TARGET'] == 'WINNT':
ASFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ]
+ EXPORTS.aom += [ 'config/win/ia32/aom_config.h' ]
else: # Android, Linux, BSDs, etc.
ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
+ EXPORTS.aom += [ 'config/linux/ia32/aom_config.h' ]
elif CONFIG['CPU_ARCH'] == 'arm':
EXPORTS.aom += files['ARM_EXPORTS']
ASFLAGS += [
'-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR,
'-I%s/libaom' % OBJDIR,
]
CFLAGS += [ '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR ]
+ EXPORTS.aom += [ 'config/linux/arm/aom_config.h' ]
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
])
else:
@@ -64,16 +70,17 @@ elif CONFIG['CPU_ARCH'] == 'arm':
'-no-integrated-as',
]
else:
# Generic C-only configuration
EXPORTS.aom += files['GENERIC_EXPORTS']
SOURCES += files['GENERIC_SOURCES']
ASFLAGS += [ '-I%s/media/libaom/config/generic/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/generic/' % TOPSRCDIR ]
+ EXPORTS.aom += [ 'config/generic/aom_config.h' ]
# We allow warnings for third-party code that can be updated from upstream.
ALLOW_COMPILER_WARNINGS = True
FINAL_LIBRARY = 'gkmedias'
if CONFIG['OS_TARGET'] == 'Android':
# Older versions of the Android NDK don't pre-define anything to indicate