mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 1399878 - Use LOCAL_INCLUDES instead of CFLAGS in some media moz.build files. r=gps 

MozReview-Commit-ID: 3PUOniPnt54

--HG--
extra : rebase_source : 01accd7951a4af7018265e91040aa7005b061902
This commit is contained in:
Ted Mielczarek 2017-09-14 06:39:27 -04:00
Родитель 8439a24741
Коммит 0677fcfacf
2 изменённых файлов: 22 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
media/libaom/moz.build
Просмотреть файл

@ -16,15 +16,15 @@ if CONFIG['CPU_ARCH'] == 'x86_64':
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 ]
LOCAL_INCLUDES += [ '/media/libaom/config/win/x64/' ]
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 ]
LOCAL_INCLUDES += [ '/media/libaom/config/mac/x64/' ]
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 ]
LOCAL_INCLUDES += [ '/media/libaom/config/linux/x64/' ]
EXPORTS.aom += [ 'config/linux/x64/aom_config.h' ]
elif CONFIG['CPU_ARCH'] == 'x86':
EXPORTS.aom += files['IA32_EXPORTS']
@ -33,15 +33,15 @@ elif CONFIG['CPU_ARCH'] == 'x86':
if CONFIG['OS_TARGET'] == 'WINNT':
if CONFIG['CC_TYPE'] == 'gcc':
ASFLAGS += [ '-I%s/media/libaom/config/win/mingw32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/win/mingw32/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libaom/config/win/mingw32/' ]
EXPORTS.aom += [ 'config/win/mingw32/aom_config.h' ]
else:
ASFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libaom/config/win/ia32/' ]
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 ]
LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ]
EXPORTS.aom += [ 'config/linux/ia32/aom_config.h' ]
elif CONFIG['CPU_ARCH'] == 'arm':
EXPORTS.aom += files['ARM_EXPORTS']
@ -49,7 +49,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
'-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR,
'-I%s/libaom' % OBJDIR,
]
CFLAGS += [ '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ]
EXPORTS.aom += [ 'config/linux/arm/aom_config.h' ]
arm_asm_files = files['ARM_SOURCES']
@ -79,7 +79,7 @@ else:
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 ]
LOCAL_INCLUDES += [ '/media/libaom/config/generic/' ]
EXPORTS.aom += [ 'config/generic/aom_config.h' ]
# We allow warnings for third-party code that can be updated from upstream.
@ -135,7 +135,7 @@ ASFLAGS += [
'-I%s/third_party/aom' % TOPSRCDIR,
]
CFLAGS += [
'-I%s/third_party/aom' % TOPSRCDIR,
'-I%s/media/libaom/config' % TOPSRCDIR, # aom_version.h
LOCAL_INCLUDES += [
'/media/libaom/config', # aom_version.h
'/third_party/aom',
]

22
media/libvpx/moz.build
Просмотреть файл

@ -18,32 +18,32 @@ if CONFIG['CPU_ARCH'] == 'x86_64':
SOURCES += files['X64_SOURCES']
if CONFIG['OS_TARGET'] == 'WINNT':
ASFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libvpx/config/win/x64/' ]
elif CONFIG['OS_TARGET'] == 'Darwin':
ASFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ]
LOCAL_includes += [ '/media/libvpx/config/mac/x64/' ]
else: # Android, Linux, BSDs, etc.
ASFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libvpx/config/linux/x64/' ]
elif CONFIG['CPU_ARCH'] == 'x86':
EXPORTS.vpx += files['IA32_EXPORTS']
SOURCES += files['IA32_SOURCES']
if CONFIG['OS_TARGET'] == 'WINNT':
ASFLAGS += [ '-I%s/media/libvpx/config/win/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/win/ia32/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libvpx/config/win/ia32/' ]
elif CONFIG['OS_TARGET'] == 'Darwin':
ASFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libvpx/config/mac/ia32/' ]
else: # Android, Linux, BSDs, etc.
ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libvpx/config/linux/ia32/' ]
elif CONFIG['CPU_ARCH'] == 'arm':
EXPORTS.vpx += files['ARM_EXPORTS']
ASFLAGS += [
'-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR,
'-I%s/libvpx' % OBJDIR,
]
CFLAGS += [ '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm/' ]
arm_asm_files = files['ARM_SOURCES']
@ -72,7 +72,7 @@ else:
EXPORTS.vpx += files['GENERIC_EXPORTS']
SOURCES += files['GENERIC_SOURCES']
ASFLAGS += [ '-I%s/media/libvpx/config/generic/' % TOPSRCDIR ]
CFLAGS += [ '-I%s/media/libvpx/config/generic/' % TOPSRCDIR ]
LOCAL_INCLUDES += [ '/media/libvpx/config/generic/' ]
# We allow warnings for third-party code that can be updated from upstream.
ALLOW_COMPILER_WARNINGS = True
@ -130,9 +130,9 @@ ASFLAGS += [
'-I%s/media/libvpx/libvpx' % TOPSRCDIR,
]
CFLAGS += [
'-I%s/media/libvpx/libvpx' % TOPSRCDIR,
'-I%s/media/libvpx/config' % TOPSRCDIR, # vpx_version.h
LOCAL_INCLUDES += [
'/media/libvpx/config', # vpx_version.h
'/media/libvpx/libvpx',
]
if CONFIG['OS_TARGET'] == 'Android':