Bug 595384 - Disable the updater utility for Android [r=rs, a2.0=blassey]
authorAlex Pakhotin <alexp@mozilla.com>
Fri, 10 Sep 2010 16:48:52 -0700
changeset 53798 6d0e5b481cc7d145def8cab16bf80fb7f120826f
parent 53797 df5f653ea4134475168aa452bfe99d4ad070771d
child 53799 f61962db89a03d79d884afbecf308acb10c72139
push idunknown
push userunknown
push dateunknown
reviewersrs
bugs595384
milestone2.0b7pre
Bug 595384 - Disable the updater utility for Android [r=rs, a2.0=blassey]
toolkit/mozapps/update/Makefile.in
toolkit/xre/Makefile.in
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -44,19 +44,21 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = update
 
 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
 
 EXTRA_PP_COMPONENTS += \
   nsUpdateService.js \
   nsUpdateServiceStub.js \
   nsUpdateService.manifest \
   $(NULL)
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -76,19 +76,21 @@ endif
 
 DEFINES += -DIMPL_XREAPI -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"'
 
 ifndef BUILD_STATIC_LIBS
 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
 DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
 EXPORTS = nsWindowsDllInterceptor.h
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CMMSRCS = nsNativeAppSupportCocoa.mm
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3267,17 +3267,17 @@ XRE_main(int argc, char* argv[], const n
       return 1;
 
     PRBool canRun = PR_FALSE;
     rv = nativeApp->Start(&canRun);
     if (NS_FAILED(rv) || !canRun) {
       return 1;
     }
 
-#if defined(MOZ_UPDATER)
+#if defined(MOZ_UPDATER) && !defined(ANDROID)
   // Check for and process any available updates
   nsCOMPtr<nsIFile> updRoot;
   PRBool persistent;
   rv = dirProvider.GetFile(XRE_UPDATE_ROOT_DIR, &persistent,
                            getter_AddRefs(updRoot));
   // XRE_UPDATE_ROOT_DIR may fail. Fallback to appDir if failed
   if (NS_FAILED(rv))
     updRoot = dirProvider.GetAppDir();