[tor-commits] [tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 18821: Disable libmdns for Android and Desktop

[gk at torproject.org]

commit 7ce38290aaac3b6351061f9ecc5cd6751d10edb4
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Apr 20 14:34:50 2016 +0000

    Bug 18821: Disable libmdns for Android and Desktop
    
    There should be no need to remove the OS X support introduced in
    https://bugzilla.mozilla.org/show_bug.cgi?id=1225726 as enabling this
    is governed by a preference (which is actually set to `false`). However,
    we remove it at build time as well (defense in depth).
    
    This is basically a backout of the relevant passages of
    https://hg.mozilla.org/mozilla-central/rev/6bfb430de85d,
    https://hg.mozilla.org/mozilla-central/rev/609b337bf7ab and
    https://hg.mozilla.org/mozilla-central/rev/8e092ec5fbbd.
---
 .../provider/PresentationDeviceProviderModule.cpp  |  2 +-
 mobile/android/installer/package-manifest.in       |  2 --
 netwerk/dns/mdns/libmdns/moz.build                 | 22 +++++++---------------
 netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp  |  2 +-
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/dom/presentation/provider/PresentationDeviceProviderModule.cpp b/dom/presentation/provider/PresentationDeviceProviderModule.cpp
index aafbed0..1e65208 100644
--- a/dom/presentation/provider/PresentationDeviceProviderModule.cpp
+++ b/dom/presentation/provider/PresentationDeviceProviderModule.cpp
@@ -28,7 +28,7 @@ static const mozilla::Module::ContractIDEntry kPresentationDeviceProviderContrac
 };
 
 static const mozilla::Module::CategoryEntry kPresentationDeviceProviderCategories[] = {
-#if defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_ANDROID) || (defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16)
+#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16
   { PRESENTATION_DEVICE_PROVIDER_CATEGORY, "MulticastDNSDeviceProvider", MULTICAST_DNS_PROVIDER_CONTRACT_ID },
 #endif
   { nullptr }
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index ac6ef47..53dbb1c 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -328,8 +328,6 @@
 @BINPATH@/components/BrowserComponents.manifest
 @BINPATH@/components/nsBrowserContentHandler.js
 @BINPATH@/components/nsBrowserGlue.js
- at BINPATH@/components/nsDNSServiceDiscovery.manifest
- at BINPATH@/components/nsDNSServiceDiscovery.js
 @BINPATH@/components/nsSetDefaultBrowser.manifest
 @BINPATH@/components/nsSetDefaultBrowser.js
 @BINPATH@/components/toolkitsearch.manifest
diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build
index 6671b5c..dcae472 100644
--- a/netwerk/dns/mdns/libmdns/moz.build
+++ b/netwerk/dns/mdns/libmdns/moz.build
@@ -4,14 +4,7 @@
 # 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/.
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    EXTRA_COMPONENTS += [
-        'nsDNSServiceDiscovery.js',
-        'nsDNSServiceDiscovery.manifest',
-    ]
-
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' or \
-        (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16':
     UNIFIED_SOURCES += [
         'MDNSResponderOperator.cpp',
         'MDNSResponderReply.cpp',
@@ -19,15 +12,14 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' or \
     ]
 
     LOCAL_INCLUDES += [
-      '/netwerk/base',
+        '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
+            'external/mdnsresponder/mDNSShared',
+        ]
     ]
 
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-        LOCAL_INCLUDES += [
-            '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
-                'external/mdnsresponder/mDNSShared',
-            ]
-        ]
+    LOCAL_INCLUDES += [
+      '/netwerk/base',
+    ]
 
 UNIFIED_SOURCES += [
     'nsDNSServiceInfo.cpp',
diff --git a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp
index 22bad3b..1ab3993 100644
--- a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp
+++ b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp
@@ -3,7 +3,7 @@
  * 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/. */
 
-#if defined(MOZ_WIDGET_COCOA) || (defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16)
+#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16
 #define ENABLE_DNS_SERVICE_DISCOVERY
 #endif