Bug 902316 - Build external projects in external tier; r=glandium, gps

--HG--
extra : rebase_source : d5b76b34c7951c4abed6acc8c9ab51fd08ed6142
This commit is contained in:
Trevor Saunders 2013-08-09 15:01:08 -07:00
parent 181107aedd
commit 7e6a4a7e53
2 changed files with 69 additions and 65 deletions

64
config/external/moz.build vendored Normal file
View File

@ -0,0 +1,64 @@
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']:
if 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']
PARALLEL_DIRS += ['../../' + i for i in external_dirs]

View File

@ -10,15 +10,17 @@ if not CONFIG['MOZ_NATIVE_NSPR']:
add_tier_dir('nspr', 'config/nspr')
add_tier_dir('precompile', 'config/makefiles/precompile')
if not CONFIG['MOZ_NATIVE_SQLITE']:
add_tier_dir('nss', 'db/sqlite3/src')
add_tier_dir('external', 'config/external')
if not CONFIG['MOZ_NATIVE_NSS']:
add_tier_dir('nss', 'security/build')
include('/config/js/js.mozbuild')
# the signing related bits of libmar depend on nss
if CONFIG['MOZ_UPDATER']:
add_tier_dir('platform', 'modules/libmar')
if CONFIG['NS_TRACE_MALLOC']:
add_tier_dir('platform', 'tools/trace-malloc/lib')
@ -39,15 +41,7 @@ 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.
@ -66,24 +60,6 @@ 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',
@ -92,39 +68,6 @@ 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')
@ -180,9 +123,6 @@ 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']: