partially backout bug 902316 because there is dependancies between the libraries we build in media/omx-plugin/ CLOSED TREE

This commit is contained in:
Trevor Saunders 2013-08-09 22:32:41 -04:00
parent af4624bf9a
commit e835591831
2 changed files with 19 additions and 19 deletions

View File

@ -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']

View File

@ -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')