mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-30 01:59:29 +00:00
Bug 771981: Don't build webrtc except for Linux/Mac/Windows; don't check for chrome dlls on windows r=bsmedberg
This commit is contained in:
parent
9e328af996
commit
79c797a5e0
21
configure.in
21
configure.in
@ -4297,8 +4297,8 @@ case "${target}" in
|
||||
MOZ_TREE_FREETYPE=1
|
||||
MOZ_MEMORY=1
|
||||
MOZ_RAW=1
|
||||
MOZ_WEBRTC=
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
MOZ_ARG_ENABLE_STRING(application,
|
||||
@ -5248,6 +5248,25 @@ if test "$NS_PRINTING"; then
|
||||
AC_DEFINE(NS_PRINT_PREVIEW)
|
||||
fi
|
||||
|
||||
dnl Turn off webrtc for OS's we don't handle yet, but allow
|
||||
dnl --enable-webrtc to override. Can disable for everything in
|
||||
dnl the master list above.
|
||||
if test -n "$MOZ_WEBRTC"; then
|
||||
case "$target" in
|
||||
*-android*|*-linuxandroid*)
|
||||
dnl Make sure doesn't get matched by *-linux*
|
||||
MOZ_WEBRTC=
|
||||
;;
|
||||
*-linux*|*-mingw*|*-darwin*)
|
||||
dnl Leave enabled
|
||||
;;
|
||||
*)
|
||||
dnl default to disabled for all others
|
||||
MOZ_WEBRTC=
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Disable WebRTC code
|
||||
dnl ========================================================
|
||||
|
@ -524,7 +524,8 @@
|
||||
|
||||
# Turn on Use Library Dependency Inputs for linking chrome.dll on Windows
|
||||
# to get incremental linking to be faster in debug builds.
|
||||
'incremental_chrome_dll%': '<!(python <(DEPTH)/tools/win/supalink/check_installed.py)',
|
||||
# Disable for mozilla since we're not Chrome (and this should have been windows-only)
|
||||
#'incremental_chrome_dll%': '<!(python <(DEPTH)/tools/win/supalink/check_installed.py)',
|
||||
|
||||
# This is the location of the sandbox binary. Chrome looks for this before
|
||||
# running the zygote process. If found, and SUID, it will be used to
|
||||
|
Loading…
x
Reference in New Issue
Block a user