partially backout bug 902316 because there is dependancies between the libraries we build in media/omx-plugin/ CLOSED TREE
authorTrevor Saunders <trev.saunders@gmail.com>
Fri, 09 Aug 2013 22:32:41 -0400
changeset 155989 2f65b3e077b962d8562dc5ad7e92a49aa24da45a
parent 155988 29c341748a6b6358110446ea3c0466dfa799fb6c
child 155990 0d82b5144c5e51e3c16f21dbc3b63a9afbe2ce75
push id407
push userlsblakk@mozilla.com
push dateTue, 03 Dec 2013 03:32:50 +0000
treeherdermozilla-release@babf8c9ebc52 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs902316
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
partially backout bug 902316 because there is dependancies between the libraries we build in media/omx-plugin/ CLOSED TREE
config/external/moz.build
toolkit/toolkit.mozbuild
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -32,33 +32,14 @@ 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]
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -63,16 +63,35 @@ if CONFIG['MOZ_JSDEBUGGER']:
 if CONFIG['MOZ_WEBRTC']:
     add_tier_dir('platform', [
         'media/webrtc',
         'media/mtransport/third_party',
         'media/mtransport/build',
         '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')
 
 if CONFIG['ENABLE_TESTS']:
     add_tier_dir('platform', 'testing/gtest')
 
 add_tier_dir('platform', [
     'uriloader',