Bug 595384 - Disable the updater utility for Android [r=rs, a2.0=blassey]

toolkit/mozapps/update/Makefile.in

@@ -49,9 +49,11 @@ XPIDLSRCS = nsIUpdateTimerManager.idl
 EXTRA_PP_COMPONENTS = nsUpdateTimerManager.js nsUpdateTimerManager.manifest
 
 ifdef MOZ_UPDATER
+ifneq ($(OS_TARGET),Android)
 DIRS = ../readstrings \
   updater \
   $(NULL)
+endif
 
 XPIDLSRCS += nsIUpdateService.idl
 

toolkit/xre/Makefile.in

@@ -81,9 +81,11 @@ CPPSRCS += nsEmbedFunctions.cpp
 endif
 
 ifdef MOZ_UPDATER
+ifneq ($(OS_TARGET),Android)
 CPPSRCS += nsUpdateDriver.cpp
 DEFINES += -DMOZ_UPDATER
 endif
+endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS += nsNativeAppSupportWin.cpp

toolkit/xre/nsAppRunner.cpp

@@ -3272,7 +3272,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
       return 1;
     }
 
-#if defined(MOZ_UPDATER)
+#if defined(MOZ_UPDATER) && !defined(ANDROID)
   // Check for and process any available updates
   nsCOMPtr<nsIFile> updRoot;
   PRBool persistent;