From 3ca64a65e26a122f4bebe2d5e78544c3470fb2e0 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Mon, 14 Feb 2011 10:07:46 -0800
Subject: [PATCH] Bug 632900 - Disable NetworkGeolocationProvider on Android.
 r=ted a=blassey

---
 dom/system/Makefile.in | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in
index 98894be399b..da344087283 100644
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -62,19 +62,23 @@ DIRS = android
 endif
 
 CPPSRCS     = \
-    nsAccelerometer.cpp \
-    $(NULL)
+  nsAccelerometer.cpp \
+  $(NULL)
 
+# On Systems that have built-in geolocation providers,
+# we really do not need these.
+ifneq (Android,$(OS_TARGET))
 EXTRA_COMPONENTS = \
-                 NetworkGeolocationProvider.js \
-                 NetworkGeolocationProvider.manifest \
-                 GPSDGeolocationProvider.js \
-                 GPSDGeolocationProvider.manifest \
-                 $(NULL)
+  NetworkGeolocationProvider.js \
+  NetworkGeolocationProvider.manifest \
+  GPSDGeolocationProvider.js \
+  GPSDGeolocationProvider.manifest \
+  $(NULL)
+endif
 
 EXPORTS     = \
-    nsAccelerometer.h \
-    $(NULL)
+  nsAccelerometer.h \
+  $(NULL)
 
 include $(topsrcdir)/config/config.mk