Bug 981780: fix disable-webrtc r=glandium

build/gyp.mozbuild

@@ -7,6 +7,7 @@
 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,

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

toolkit/toolkit.mozbuild

@@ -49,6 +49,8 @@ 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']:
@@ -65,7 +67,6 @@ if CONFIG['MOZ_WEBRTC']:
         'media/mtransport/third_party',
         'media/mtransport/build',
         'media/mtransport/standalone',
-        'media/libyuv',
     ])
 
 if CONFIG['MOZ_OMX_PLUGIN']: