Backed out changesets 33e91919b06b and a3a67e1ded26 (bug 981780) for OSX bustage.

CLOSED TREE

build/gyp.mozbuild

@@ -7,7 +7,6 @@
 gyp_vars = {
     'build_with_mozilla': 1,
     'build_with_chromium': 0,
-    'use_official_google_api_keys': 0,
     'have_clock_monotonic': 1 if CONFIG['HAVE_CLOCK_MONOTONIC'] else 0,
     'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
     'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,

dom/media/tests/mochitest/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if CONFIG ['MOZ_WEBRTC']:
-	MOCHITEST_MANIFESTS += ['mochitest.ini']
-	WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']
+WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']
+
+MOCHITEST_MANIFESTS += ['mochitest.ini']
 

layout/tools/reftest/reftest.js

@@ -660,12 +660,6 @@ function BuildConditionSandbox(aURL) {
     sandbox.AddressSanitizer = false;
 #endif
 
-#if MOZ_WEBRTC
-    sandbox.webrtc = true;
-#else
-    sandbox.webrtc = false;
-#endif
-
     var hh = CC[NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX + "http"].
                  getService(CI.nsIHttpProtocolHandler);
     sandbox.http = { __exposedProps__: {} };

media/libyuv/build/dir_exists.py

@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# exists to keep common.gypi happy and avoid modifying it
-def main():
-  return 0

testing/crashtest/crashtests.list

@@ -31,7 +31,7 @@ include ../../dom/xbl/crashtests/crashtests.list
 include ../../dom/xslt/crashtests/crashtests.list
 
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
-skip-if(B2G||browserIsRemote||!webrtc) include ../../dom/media/tests/crashtests/crashtests.list
+skip-if(B2G||browserIsRemote) include ../../dom/media/tests/crashtests/crashtests.list
 
 include ../../dom/src/offline/crashtests/crashtests.list
 include ../../dom/src/jsurl/crashtests/crashtests.list

toolkit/toolkit.mozbuild

@@ -49,8 +49,6 @@ add_tier_dir('platform', ['ipc', 'js/ipc'])
 
 add_tier_dir('platform', ['hal', 'js/xpconnect', 'intl/chardet'])
 
-add_tier_dir('platform', 'media/libyuv')
-
 add_tier_dir('platform', ['modules/libjar', 'storage'])
 
 if CONFIG['MOZ_PERMISSIONS']:
@@ -67,6 +65,7 @@ if CONFIG['MOZ_WEBRTC']:
         'media/mtransport/third_party',
         'media/mtransport/build',
         'media/mtransport/standalone',
+        'media/libyuv',
     ])
 
 if CONFIG['MOZ_OMX_PLUGIN']: