mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
partially backout bug 902316 because there is dependancies between the libraries we build in media/omx-plugin/ CLOSED TREE
This commit is contained in:
parent
af4624bf9a
commit
e835591831
19
config/external/moz.build
vendored
19
config/external/moz.build
vendored
@ -37,25 +37,6 @@ if CONFIG['MOZ_SOUNDTOUCH']:
|
||||
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']
|
||||
|
||||
|
@ -68,6 +68,25 @@ if CONFIG['MOZ_WEBRTC']:
|
||||
'media/mtransport/standalone',
|
||||
])
|
||||
|
||||
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 CONFIG['ENABLE_TESTS']:
|
||||
add_tier_dir('platform', 'testing/specialpowers')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user