[tbb-commits] [tor-browser/tor-browser-52.1.0esr-7.0-2] squash! Bug 18821: Disable libmdns for Android and Desktop

[gk at torproject.org]

commit a979fd68b78a17814bde3544b7d8896c6089cf6e
Author: Georg Koppen <gk at torproject.org>
Date:   Wed May 24 13:45:47 2017 +0000

    squash! Bug 18821: Disable libmdns for Android and Desktop
    
    Bug 21861: Disable additional mDNS code to avoid proxy bypasses
---
 dom/presentation/provider/moz.build          | 16 ----------------
 mobile/android/installer/package-manifest.in |  4 ----
 netwerk/dns/mdns/libmdns/moz.build           | 16 ----------------
 3 files changed, 36 deletions(-)

diff --git a/dom/presentation/provider/moz.build b/dom/presentation/provider/moz.build
index 18428b5..7f82700 100644
--- a/dom/presentation/provider/moz.build
+++ b/dom/presentation/provider/moz.build
@@ -12,8 +12,6 @@ EXTRA_COMPONENTS += [
 UNIFIED_SOURCES += [
     'DeviceProviderHelpers.cpp',
     'DisplayDeviceProvider.cpp',
-    'MulticastDNSDeviceProvider.cpp',
-    'PresentationDeviceProviderModule.cpp',
 ]
 
 EXTRA_JS_MODULES.presentation += [
@@ -22,19 +20,5 @@ EXTRA_JS_MODULES.presentation += [
     'StateMachineHelper.jsm',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    EXTRA_COMPONENTS += [
-        # For android presentation device
-        'AndroidCastDeviceProvider.js',
-        'AndroidCastDeviceProvider.manifest',
-        # for TV 2.5 device backward capability
-        'LegacyPresentationControlService.js',
-        'LegacyProviders.manifest',
-    ]
-
-    UNIFIED_SOURCES += [
-        'LegacyMDNSDeviceProvider.cpp',
-    ]
-
 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 417d34a..025094c 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -404,10 +404,6 @@
 @BINPATH@/components/PresentationNetworkHelper.manifest
 @BINPATH@/components/PresentationDataChannelSessionTransport.js
 @BINPATH@/components/PresentationDataChannelSessionTransport.manifest
- at BINPATH@/components/LegacyProviders.manifest
- at BINPATH@/components/LegacyPresentationControlService.js
- at BINPATH@/components/AndroidCastDeviceProvider.manifest
- at BINPATH@/components/AndroidCastDeviceProvider.js
 
 @BINPATH@/components/TVSimulatorService.js
 @BINPATH@/components/TVSimulatorService.manifest
diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build
index f14e411..422621f 100644
--- a/netwerk/dns/mdns/libmdns/moz.build
+++ b/netwerk/dns/mdns/libmdns/moz.build
@@ -22,22 +22,6 @@ if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16'
     ]
 
 
-else:
-    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',