Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset fd936ec22d08 for mar bustage on osx on a CLOSED TREE

Browse Source
This commit is contained in:
Trevor Saunders 2013-08-09 15:24:39 -04:00
parent c6763d9d9d
commit 291fdd73f6
2 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
config/external/moz.build vendored
View File

@ -1,66 +0,0 @@
external_dirs = []
if not CONFIG['MOZ_NATIVE_SQLITE']:
external_dirs += ['db/sqlite3/src']
if not CONFIG['MOZ_NATIVE_JPEG']:
external_dirs += ['media/libjpeg']
if CONFIG['MOZ_UPDATER'] and not CONFIG['MOZ_NATIVE_BZ2']:
external_dirs += ['modules/libbz2']
if CONFIG['MOZ_VORBIS']:
external_dirs += ['media/libvorbis']
if CONFIG['MOZ_TREMOR']:
external_dirs += ['media/libtremor']
if CONFIG['MOZ_OPUS']:
external_dirs += ['media/libopus']
if CONFIG['MOZ_WEBM']:
external_dirs += ['media/libnestegg']
if CONFIG['MOZ_VP8'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
external_dirs += ['media/libvpx']
if CONFIG['MOZ_OGG']:
external_dirs += ['media/libogg', 'media/libtheora']
if CONFIG['MOZ_SPEEX_RESAMPLER']:
external_dirs += ['media/libspeex_resampler']
if CONFIG['MOZ_SOUNDTOUCH']:
external_dirs += ['media/libsoundtouch']
if CONFIG['MOZ_CUBEB']:
external_dirs += ['media/libcubeb']
if CONFIG['MOZ_OMX_PLUGIN']:
external_dirs += [
'media/omx-plugin/lib/ics/libutils',
'media/omx-plugin/lib/ics/libstagefright',
'media/omx-plugin/lib/gb/libutils',
'media/omx-plugin/lib/gb/libstagefright',
'media/omx-plugin/lib/gb/libstagefright_color_conversion',
'media/omx-plugin/lib/gb235/libstagefright',
'media/omx-plugin/lib/froyo/libstagefright',
'media/omx-plugin',
'media/omx-plugin/gb',
'media/omx-plugin/gb235',
'media/omx-plugin/froyo',
'media/omx-plugin/lib/hc/libstagefright',
'media/omx-plugin/hc',
'media/omx-plugin/sony',
'media/omx-plugin/jb-htc',
]
if not CONFIG['MOZ_NATIVE_PNG']:
external_dirs += ['media/libpng']
external_dirs += ['media/kiss_fft']
if CONFIG['MOZ_UPDATER']:
external_dirs += ['modules/libmar']
PARALLEL_DIRS += ['../../' + i for i in external_dirs]

66
toolkit/toolkit.mozbuild
View File

@ -10,7 +10,9 @@ if not CONFIG['MOZ_NATIVE_NSPR']:
add_tier_dir('nspr', 'config/nspr')
add_tier_dir('precompile', 'config/makefiles/precompile')
add_tier_dir('external', 'config/external')
if not CONFIG['MOZ_NATIVE_SQLITE']:
add_tier_dir('nss', 'db/sqlite3/src')
if not CONFIG['MOZ_NATIVE_NSS']:
add_tier_dir('nss', 'security/build')
@ -37,7 +39,15 @@ add_tier_dir('platform', [
if CONFIG['MOZ_AUTH_EXTENSION']:
add_tier_dir('platform', 'extensions/auth')
# External/3rd party libraries.
if not CONFIG['MOZ_NATIVE_JPEG']:
add_tier_dir('platform', 'media/libjpeg')
if CONFIG['MOZ_UPDATER']:
if not CONFIG['MOZ_NATIVE_BZ2']:
add_tier_dir('platform', 'modules/libbz2')
add_tier_dir('platform', 'other-licenses/bsdiff')
# Gecko/Core components.
@ -56,6 +66,24 @@ add_tier_dir('platform', 'rdf')
if CONFIG['MOZ_JSDEBUGGER']:
add_tier_dir('platform', 'js/jsd')
if CONFIG['MOZ_VORBIS']:
add_tier_dir('platform', 'media/libvorbis')
if CONFIG['MOZ_TREMOR']:
add_tier_dir('platform', 'media/libtremor')
if CONFIG['MOZ_OPUS']:
add_tier_dir('platform', 'media/libopus')
if CONFIG['MOZ_WEBM']:
add_tier_dir('platform', 'media/libnestegg')
if CONFIG['MOZ_VP8'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
add_tier_dir('platform', 'media/libvpx')
if CONFIG['MOZ_OGG']:
add_tier_dir('platform', ['media/libogg', 'media/libtheora'])
if CONFIG['MOZ_WEBRTC']:
add_tier_dir('platform', [
'media/webrtc',
@ -64,6 +92,39 @@ if CONFIG['MOZ_WEBRTC']:
'media/mtransport/standalone',
])
if CONFIG['MOZ_SPEEX_RESAMPLER']:
add_tier_dir('platform', 'media/libspeex_resampler')
if CONFIG['MOZ_SOUNDTOUCH']:
add_tier_dir('platform', 'media/libsoundtouch')
if CONFIG['MOZ_CUBEB']:
add_tier_dir('platform', 'media/libcubeb')
if CONFIG['MOZ_OMX_PLUGIN']:
add_tier_dir('platform', [
'media/omx-plugin/lib/ics/libutils',
'media/omx-plugin/lib/ics/libstagefright',
'media/omx-plugin/lib/gb/libutils',
'media/omx-plugin/lib/gb/libstagefright',
'media/omx-plugin/lib/gb/libstagefright_color_conversion',
'media/omx-plugin/lib/gb235/libstagefright',
'media/omx-plugin/lib/froyo/libstagefright',
'media/omx-plugin',
'media/omx-plugin/gb',
'media/omx-plugin/gb235',
'media/omx-plugin/froyo',
'media/omx-plugin/lib/hc/libstagefright',
'media/omx-plugin/hc',
'media/omx-plugin/sony',
'media/omx-plugin/jb-htc',
])
if not CONFIG['MOZ_NATIVE_PNG']:
add_tier_dir('platform', 'media/libpng')
add_tier_dir('platform', 'media/kiss_fft')
if CONFIG['ENABLE_TESTS']:
add_tier_dir('platform', 'testing/specialpowers')
@ -119,6 +180,9 @@ if CONFIG['MOZ_SPELLCHECK']:
add_tier_dir('platform', 'security/manager')
if CONFIG['MOZ_UPDATER']:
add_tier_dir('platform', 'modules/libmar')
add_tier_dir('platform', 'toolkit')
if CONFIG['MOZ_PREF_EXTENSIONS']: