From e16bcd08aae85a7d9c2de5a4b1c733280cb81112 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 13 May 2018 00:08:52 +0200
Subject: Remove MOZ_WIDGET_GONK [2/2]

Tag #288
---
 netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp | 27 ++--------------------
 netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp  |  2 +-
 2 files changed, 3 insertions(+), 26 deletions(-)

(limited to 'netwerk/dns')

diff --git a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp
index 8ffa74b71..cec8033d1 100644
--- a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp
+++ b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp
@@ -9,10 +9,6 @@
 #include "nsXULAppAPI.h"
 #include "private/pprio.h"
 
-#ifdef MOZ_WIDGET_GONK
-#include <cutils/properties.h>
-#endif // MOZ_WIDGET_GONK
-
 namespace mozilla {
 namespace net {
 
@@ -21,29 +17,13 @@ namespace {
 inline void
 StartService()
 {
-#ifdef MOZ_WIDGET_GONK
-  char value[PROPERTY_VALUE_MAX] = { '\0' };
-  property_get("init.svc.mdnsd", value, "");
-
-  if (strcmp(value, "running") == 0) {
-    return;
-  }
-  property_set("ctl.start", "mdnsd");
-#endif // MOZ_WIDGET_GONK
+  /*** STUB ***/
 }
 
 inline void
 StopService()
 {
-#ifdef MOZ_WIDGET_GONK
-  char value[PROPERTY_VALUE_MAX] = { '\0' };
-  property_get("init.svc.mdnsd", value, "");
-
-  if (strcmp(value, "stopped") == 0) {
-    return;
-  }
-  property_set("ctl.stop", "mdnsd");
-#endif // MOZ_WIDGET_GONK
+  /*** STUB ***/
 }
 
 class ServiceCounter
@@ -157,9 +137,6 @@ NS_IMPL_ISUPPORTS(nsDNSServiceDiscovery, nsIDNSServiceDiscovery)
 
 nsDNSServiceDiscovery::~nsDNSServiceDiscovery()
 {
-#ifdef MOZ_WIDGET_GONK
-  StopService();
-#endif
 }
 
 nsresult
diff --git a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp
index 22bad3bc7..aa1c973b5 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_COCOA)
 #define ENABLE_DNS_SERVICE_DISCOVERY
 #endif
 
-- 
cgit v1.2.3