Bug 632900 - "Disable NetworkGeolocationProvider on Android." [r=ted.mielczarek]
authorDoug Turner <doug.turner>
Wed, 09 Feb 2011 11:05:00 -0800
changeset 63548 995bf49d8c54b66b6f9d2e5147aeb0fcc3961524
parent 63547 aedc13304812236454baf02f42a723df9152f1eb
child 63549 7c996666a93016a30fa3bd1750731a1604742500
push idunknown
push userunknown
push dateunknown
reviewersted.mielczarek
bugs632900
milestone2.2a1pre
Bug 632900 - "Disable NetworkGeolocationProvider on Android." [r=ted.mielczarek]
dom/system/Makefile.in
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -57,29 +57,33 @@ ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOL
 DIRS = cocoa
 endif
 
 ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = android
 endif
 
 CPPSRCS     = \
-    nsAccelerometer.cpp \
-    $(NULL)
+  nsAccelerometer.cpp \
+  $(NULL)
 
+# On Systems that have build 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
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1