Bug 950676 - Enable unified builds for b2g by default; r=glandium
☠☠ backed out by 86fb458dcc99 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 17 Jun 2014 08:35:19 -0400
changeset 188991 9c6b3b1f05ea92171bd828f512b57e5440cafb5b
parent 188990 2d8eb8af4cd0453d840dc4de6c67ea6d0f691dd2
child 189093 d5fc0348fab5ff9be353853cfa9a076f13d08da2
push id8091
push usereakhgari@mozilla.com
push dateTue, 17 Jun 2014 12:35:26 +0000
treeherderb2g-inbound@9c6b3b1f05ea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs950676
milestone33.0a1
Bug 950676 - Enable unified builds for b2g by default; r=glandium
b2g/config/mozconfigs/common
media/webrtc/moz.build
--- a/b2g/config/mozconfigs/common
+++ b/b2g/config/mozconfigs/common
@@ -3,10 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 no_tooltool=1
 no_sccache=1
 
 # This file is included at the top of all b2g mozconfigs
 
 . "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --disable-unified-compilation
--- a/media/webrtc/moz.build
+++ b/media/webrtc/moz.build
@@ -59,16 +59,17 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
     ]
     # These files cannot be built in unified mode because they force NSPR logging.
     signaling_non_unified_sources_2 = [
         'signaling/src/callcontrol/CallControlManagerImpl.cpp',
         'signaling/src/common/browser_logging/CSFLog.cpp',
         'signaling/src/media-conduit/AudioConduit.cpp',
         'signaling/src/media-conduit/CodecStatistics.cpp',
         'signaling/src/media-conduit/VideoConduit.cpp',
+        'signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp',
         'signaling/src/media/CSFAudioControlWrapper.cpp',
         'signaling/src/media/CSFVideoControlWrapper.cpp',
         'signaling/src/media/VcmSIPCCBinding.cpp',
         'signaling/src/mediapipeline/MediaPipeline.cpp',
         'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
         'signaling/src/mediapipeline/SrtpFlow.cpp',
         'signaling/src/peerconnection/MediaStreamList.cpp',
         'signaling/src/peerconnection/PeerConnectionCtx.cpp',