Commit 90a5a256 authored by Georg Koppen's avatar Georg Koppen
Browse files

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.
parent eef151ce

dom/presentation/provider/PresentationDeviceProviderModule.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 }

mobile/android/installer/package-manifest.in

+0 −2
Original line number Diff line number Diff line
@@ -328,8 +328,6 @@ 
@BINPATH@/components/BrowserComponents.manifest

@BINPATH@/components/nsBrowserContentHandler.js

@BINPATH@/components/nsBrowserGlue.js

@BINPATH@/components/nsDNSServiceDiscovery.manifest

@BINPATH@/components/nsDNSServiceDiscovery.js

@BINPATH@/components/nsSetDefaultBrowser.manifest

@BINPATH@/components/nsSetDefaultBrowser.js

@BINPATH@/components/toolkitsearch.manifest

netwerk/dns/mdns/libmdns/moz.build

+7 −15
Original line number Diff line number Diff line
@@ -4,31 +4,23 @@ 
# 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',

        'nsDNSServiceDiscovery.cpp',

    ]



    LOCAL_INCLUDES += [

      '/netwerk/base',

    ]



    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',

    'nsMulticastDNSModule.cpp',

netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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