Bug 715749 - service broke builds with --disable-updater. r=rstrong
authorBrian R. Bondy <netzen@gmail.com>
Tue, 10 Jan 2012 11:28:50 -0500
changeset 85356 1b76dd555ee7d5cdcbaf6e5b811c44a3a9f5af4a
parent 85355 5060dad145fd1ba698f4cf738faa77a9e95ef77a
child 85357 e59ed78d1ed470d503fb9bb111e664a2a17505d8
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs715749
milestone12.0a1
Bug 715749 - service broke builds with --disable-updater. r=rstrong
toolkit/components/maintenanceservice/Makefile.in
toolkit/mozapps/update/Makefile.in
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@@ -90,9 +90,10 @@ include $(topsrcdir)/config/rules.mk
 DEFINES += -DNS_NO_XPCOM
 
 ifdef _MSC_VER
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
 
 # Pick up nsWindowsRestart.cpp
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre \
-  -I$(topsrcdir)/toolkit/mozapps/update/common
+  -I$(topsrcdir)/toolkit/mozapps/update/common \
+  $(NULL)
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -58,16 +58,28 @@ endif
 
 XPIDLSRCS += nsIUpdateService.idl
 
 EXTRA_PP_COMPONENTS += \
   nsUpdateService.js \
   nsUpdateServiceStub.js \
   nsUpdateService.manifest \
   $(NULL)
+else
+
+# If only the maintenance service is installed and not
+# the updater, then the maintenance service may still be
+# used for other things.  We need to build update/common
+# which the maintenance service uses.
+ifdef MOZ_MAINTENANCE_SERVICE
+DIRS = ../readstrings
+ifneq ($(OS_TARGET),Android)
+DIRS += common
+endif
+endif
 endif
 
 ifdef ENABLE_TESTS
 DIRS += test_timermanager
 # Update tests require the updater binary
 ifdef MOZ_UPDATER
 DIRS += test
 ifdef MOZ_MAINTENANCE_SERVICE