Bug 981780: fix disable-webrtc r=glandium
☠☠ backed out by a7a931fe4f40 ☠ ☠
authorRandell Jesup <rjesup@jesup.org>
Fri, 09 May 2014 14:40:32 -0400
changeset 182382 a3a67e1ded265d23e7cd1d80a3864a3bf784ce63
parent 182381 9b180bf56cdb0694e31ef06bd93c5f25751af05e
child 182383 33e91919b06bdb8b3c554f9382b799211de86a44
push id43280
push userrjesup@wgate.com
push dateFri, 09 May 2014 18:43:20 +0000
treeherdermozilla-inbound@33e91919b06b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs981780
milestone32.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
Bug 981780: fix disable-webrtc r=glandium
build/gyp.mozbuild
media/libyuv/build/dir_exists.py
toolkit/toolkit.mozbuild
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -2,16 +2,17 @@
 # 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,
new file mode 100755
--- /dev/null
+++ b/media/libyuv/build/dir_exists.py
@@ -0,0 +1,8 @@
+#!/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/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -44,33 +44,34 @@ 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',