Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 14:25:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 981780: fix disable-webrtc r=glandium

Browse Source
This commit is contained in:
Randell Jesup 2014-05-09 14:40:32 -04:00
parent c17eeed597
commit 71910ce4dc
5 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/gyp.mozbuild
View File

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

13
media/libyuv/build/dir_exists.py Normal file
View File

@ -0,0 +1,13 @@
#!/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/.
import sys
import subprocess
import os.path
def main():
return subprocess.call([sys.executable, "../webrtc/trunk/build/dir_exists.py"] + sys.argv[1:])
if __name__ == '__main__':
sys.exit(main())

12
media/libyuv/build/mac/find_sdk.py Executable file
View File

@ -0,0 +1,12 @@
#!/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/.
import sys
import subprocess
def main():
return subprocess.call([sys.executable, "../webrtc/trunk/build/mac/find_sdk.py"] + sys.argv[1:])
if __name__ == '__main__':
sys.exit(main())

2
media/webrtc/trunk/build/common.gypi
View File

@ -924,7 +924,7 @@
'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
'conditions': [
['OS=="win" and "<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
['"<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
'windows_sdk_path%': '<(windows_sdk_default_path)',
}, {
'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',

3
toolkit/toolkit.mozbuild
View File

@ -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']: