Backed out changesets 33e91919b06b and a3a67e1ded26 (bug 981780) for OSX bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 09 May 2014 15:26:13 -0400
changeset 182387 a7a931fe4f40de33925a3046215cfea74f3ab95d
parent 182386 2bafee610170b2836b89f0150e7b3de2c8aa3815
child 182388 6505362315026cc1dba649bdf48c8cb01af2503c
push id43283
push userryanvm@gmail.com
push dateFri, 09 May 2014 19:25:59 +0000
treeherdermozilla-inbound@a7a931fe4f40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs981780
milestone32.0a1
backs out33e91919b06bdb8b3c554f9382b799211de86a44
a3a67e1ded265d23e7cd1d80a3864a3bf784ce63
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
Backed out changesets 33e91919b06b and a3a67e1ded26 (bug 981780) for OSX bustage. CLOSED TREE
build/gyp.mozbuild
dom/media/tests/mochitest/moz.build
layout/tools/reftest/reftest.js
media/libyuv/build/dir_exists.py
testing/crashtest/crashtests.list
toolkit/toolkit.mozbuild
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -2,17 +2,16 @@
 # vim: set filetype=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/.
 
 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,
     'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
     # basic stuff for everything
     'include_internal_video_render': 0,
     'clang_use_chrome_plugins': 0,
     'enable_protobuf': 0,
--- a/dom/media/tests/mochitest/moz.build
+++ b/dom/media/tests/mochitest/moz.build
@@ -1,10 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=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/.
 
-if CONFIG ['MOZ_WEBRTC']:
-	MOCHITEST_MANIFESTS += ['mochitest.ini']
-	WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']
+WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']
 
+MOCHITEST_MANIFESTS += ['mochitest.ini']
+
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -655,22 +655,16 @@ function BuildConditionSandbox(aURL) {
     }
 
 #if MOZ_ASAN
     sandbox.AddressSanitizer = true;
 #else
     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__: {} };
     for each (var prop in [ "userAgent", "appName", "appVersion",
                             "vendor", "vendorSub",
                             "product", "productSub",
                             "platform", "oscpu", "language", "misc" ]) {
         sandbox.http[prop] = hh[prop];
deleted file mode 100755
--- a/media/libyuv/build/dir_exists.py
+++ /dev/null
@@ -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
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -26,17 +26,17 @@ include ../../dom/base/crashtests/crasht
 include ../../dom/bindings/crashtests/crashtests.list
 include ../../dom/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 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
 
 include ../../editor/crashtests.list
 
 include ../../intl/lwbrk/src/crashtests/crashtests.list
 include ../../intl/uconv/crashtests/crashtests.list
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -44,34 +44,33 @@ if CONFIG['MOZ_UPDATER']:
     add_tier_dir('platform', 'other-licenses/bsdiff')
 
 # Gecko/Core components.
 
 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']:
     add_tier_dir('platform', ['extensions/cookie', 'extensions/permissions'])
 
 add_tier_dir('platform', 'rdf')
 
 if CONFIG['MOZ_JSDEBUGGER']:
     add_tier_dir('platform', 'js/jsd')
 
 if CONFIG['MOZ_WEBRTC']:
     add_tier_dir('platform', [
         'media/webrtc',
         'media/mtransport/third_party',
         'media/mtransport/build',
         'media/mtransport/standalone',
+        'media/libyuv',
     ])
 
 if CONFIG['MOZ_OMX_PLUGIN']:
     add_tier_dir('platform', [
         'media/omx-plugin/lib/ics/libutils',
         'media/omx-plugin/lib/ics/libstagefright',
         'media/omx-plugin/lib/ics/libvideoeditorplayer',
         'media/omx-plugin/lib/gb/libutils',