Bug 771981: Don't build webrtc except for Linux/Mac/Windows; don't check for chrome dlls on windows r=bsmedberg
authorRandell Jesup <rjesup@jesup.org>
Mon, 09 Jul 2012 14:34:33 -0400
changeset 98741 7cfd416e0b06fe24b1d265d6c5766e9a448c0f58
parent 98740 b9b7b40019a0050a3d440458fffe70f32a20ec8d
child 98742 7f65a44991de788f8b6598a9212d88c1a689dab5
child 98758 ac870e3e94f38fb14e1234a4ea50bc652ffc6092
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs771981
milestone16.0a1
Bug 771981: Don't build webrtc except for Linux/Mac/Windows; don't check for chrome dlls on windows r=bsmedberg
configure.in
media/webrtc/trunk/build/common.gypi
--- a/configure.in
+++ b/configure.in
@@ -4292,18 +4292,18 @@ case "${target}" in
         fi
 
         NSS_DISABLE_DBM=1
         NECKO_WIFI=
         MOZ_THEME_FASTSTRIPE=1
         MOZ_TREE_FREETYPE=1
         MOZ_MEMORY=1
         MOZ_RAW=1
-        MOZ_WEBRTC=
         ;;
+
 esac
 
 MOZ_ARG_ENABLE_STRING(application,
 [  --enable-application=APP
                           Options include:
                             browser (Firefox)
                             xulrunner
                             tools/update-packaging (AUS-related packaging tools)],
@@ -5243,16 +5243,35 @@ MOZ_ARG_DISABLE_BOOL(printing,
     NS_PRINTING=,
     NS_PRINTING=1)
 
 if test "$NS_PRINTING"; then
     AC_DEFINE(NS_PRINTING)
     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 ========================================================
 MOZ_ARG_DISABLE_BOOL(webrtc,
 [  --disable-webrtc        Disable support for WebRTC],
     MOZ_WEBRTC=,
     MOZ_WEBRTC=1)
 
--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -519,17 +519,18 @@
     # but that doesn't work as we'd like.
     'msvs_debug_link_incremental%': '2',
 
     # Needed for some of the largest modules.
     'msvs_debug_link_nonincremental%': '1',
 
     # 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
     # sandbox the zygote process and, thus, all renderer processes.
     'linux_sandbox_path%': '',
 
     # Set this to true to enable SELinux support.
     'selinux%': 0,