From 86bab99e16bffb3829b73917ced35da2ec71e834 Mon Sep 17 00:00:00 2001 From: Georg Koppen Date: Wed, 20 Apr 2016 14:34:50 +0000 Subject: [PATCH] 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. Fixed bug 21861 (Disable additional mDNS code to avoid proxy bypasses) as well. --- browser/installer/package-manifest.in | 5 --- .../PresentationDeviceProviderModule.cpp | 7 +--- dom/presentation/provider/moz.build | 9 ------ mobile/android/installer/package-manifest.in | 6 ---- netwerk/dns/mdns/libmdns/moz.build | 32 ------------------- .../dns/mdns/libmdns/nsMulticastDNSModule.cpp | 4 --- 6 files changed, 1 insertion(+), 62 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index ea8785bd6be3d..a1fba3a84cc23 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -348,11 +348,6 @@ @RESPATH@/components/UAOverridesBootstrapper.manifest @RESPATH@/components/WellKnownOpportunisticUtils.js @RESPATH@/components/WellKnownOpportunisticUtils.manifest -#ifndef XP_MACOSX -; OSX uses native platform impl. Windows, Linux, and Android uses fallback JS impl. -@BINPATH@/components/nsDNSServiceDiscovery.manifest -@BINPATH@/components/nsDNSServiceDiscovery.js -#endif @RESPATH@/browser/components/BrowserFeeds.manifest @RESPATH@/browser/components/FeedConverter.js @RESPATH@/browser/components/FeedWriter.js diff --git a/dom/presentation/provider/PresentationDeviceProviderModule.cpp b/dom/presentation/provider/PresentationDeviceProviderModule.cpp index 4afa3c08d3ecc..8b7f181655eb1 100644 --- a/dom/presentation/provider/PresentationDeviceProviderModule.cpp +++ b/dom/presentation/provider/PresentationDeviceProviderModule.cpp @@ -33,12 +33,7 @@ static const mozilla::Module::ContractIDEntry {nullptr}}; static const mozilla::Module::CategoryEntry - kPresentationDeviceProviderCategories[] = { -#if defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_ANDROID) - {PRESENTATION_DEVICE_PROVIDER_CATEGORY, "MulticastDNSDeviceProvider", - MULTICAST_DNS_PROVIDER_CONTRACT_ID}, -#endif - {nullptr}}; + kPresentationDeviceProviderCategories[] = {{nullptr}}; static const mozilla::Module kPresentationDeviceProviderModule = { mozilla::Module::kVersion, kPresentationDeviceProviderCIDs, diff --git a/dom/presentation/provider/moz.build b/dom/presentation/provider/moz.build index 0a26a5b48c83f..7472873502a85 100644 --- a/dom/presentation/provider/moz.build +++ b/dom/presentation/provider/moz.build @@ -11,8 +11,6 @@ EXTRA_COMPONENTS += [ UNIFIED_SOURCES += [ 'DeviceProviderHelpers.cpp', - 'MulticastDNSDeviceProvider.cpp', - 'PresentationDeviceProviderModule.cpp', ] EXTRA_JS_MODULES.presentation += [ @@ -21,12 +19,5 @@ EXTRA_JS_MODULES.presentation += [ 'StateMachineHelper.jsm', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXTRA_COMPONENTS += [ - # For android presentation device - 'AndroidCastDeviceProvider.js', - 'AndroidCastDeviceProvider.manifest', - ] - include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index f7e49510c2853..6f6a02082becd 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -268,10 +268,6 @@ @BINPATH@/components/WellKnownOpportunisticUtils.manifest @BINPATH@/components/mozProtocolHandler.js @BINPATH@/components/mozProtocolHandler.manifest -#ifndef MOZ_GECKOVIEW_JAR -@BINPATH@/components/nsDNSServiceDiscovery.manifest -@BINPATH@/components/nsDNSServiceDiscovery.js -#endif @BINPATH@/components/toolkitsearch.manifest @BINPATH@/components/nsSearchService.js @BINPATH@/components/nsSidebar.js @@ -390,8 +386,6 @@ @BINPATH@/components/PresentationNetworkHelper.manifest @BINPATH@/components/PresentationDataChannelSessionTransport.js @BINPATH@/components/PresentationDataChannelSessionTransport.manifest -@BINPATH@/components/AndroidCastDeviceProvider.manifest -@BINPATH@/components/AndroidCastDeviceProvider.js #endif @BINPATH@/components/mozIntl.manifest diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build index fee67758dd635..fc7a18f13888f 100644 --- a/netwerk/dns/mdns/libmdns/moz.build +++ b/netwerk/dns/mdns/libmdns/moz.build @@ -4,38 +4,6 @@ # 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'] == 'cocoa': - UNIFIED_SOURCES += [ - 'MDNSResponderOperator.cpp', - 'MDNSResponderReply.cpp', - 'nsDNSServiceDiscovery.cpp', - ] - - LOCAL_INCLUDES += [ - '/netwerk/base', - ] - -else: - EXTRA_COMPONENTS += [ - 'nsDNSServiceDiscovery.js', - 'nsDNSServiceDiscovery.manifest', - ] - - EXTRA_JS_MODULES += [ - 'fallback/DataReader.jsm', - 'fallback/DataWriter.jsm', - 'fallback/DNSPacket.jsm', - 'fallback/DNSRecord.jsm', - 'fallback/DNSResourceRecord.jsm', - 'fallback/DNSTypes.jsm', - 'fallback/MulticastDNS.jsm', - ] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXTRA_JS_MODULES += [ - 'MulticastDNSAndroid.jsm', - ] - UNIFIED_SOURCES += [ 'nsDNSServiceInfo.cpp', 'nsMulticastDNSModule.cpp', diff --git a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp index bcb9a9aabebee..3f93a7da6220a 100644 --- a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp +++ b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp @@ -3,10 +3,6 @@ * 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) -#define ENABLE_DNS_SERVICE_DISCOVERY -#endif - #include "mozilla/ModuleUtils.h" #ifdef ENABLE_DNS_SERVICE_DISCOVERY -- GitLab