summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-02-20 19:10:31 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-02-20 19:10:31 +0100
commit73551520db0d9e87cba9060271534aa5e8401a4a (patch)
tree2adf06c717ff11123bffd6cbb5ad6c7ddcfa9bba
parent26d7c44f1707482727167042da0922bff0efb6b3 (diff)
downloadUXP-73551520db0d9e87cba9060271534aa5e8401a4a.tar
UXP-73551520db0d9e87cba9060271534aa5e8401a4a.tar.gz
UXP-73551520db0d9e87cba9060271534aa5e8401a4a.tar.lz
UXP-73551520db0d9e87cba9060271534aa5e8401a4a.tar.xz
UXP-73551520db0d9e87cba9060271534aa5e8401a4a.zip
Restore building of common-standalone lib for updater.
Tag #145
-rw-r--r--toolkit/moz.build8
-rw-r--r--toolkit/mozapps/update/updater/updater-common.build3
2 files changed, 11 insertions, 0 deletions
diff --git a/toolkit/moz.build b/toolkit/moz.build
index e53a6066d..158e760dc 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -27,6 +27,14 @@ DIRS += ['mozapps/extensions']
if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
DIRS += ['mozapps/update']
+if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+# Including mozapps/update/common-standalone allows the maintenance service
+# to be built so the maintenance service can be used for things other than
+# updating applications.
+ DIRS += [
+ 'mozapps/update/common-standalone',
+ ]
+
DIRS += ['xre']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
diff --git a/toolkit/mozapps/update/updater/updater-common.build b/toolkit/mozapps/update/updater/updater-common.build
index 7b7ee35bb..6444df8d9 100644
--- a/toolkit/mozapps/update/updater/updater-common.build
+++ b/toolkit/mozapps/update/updater/updater-common.build
@@ -33,6 +33,9 @@ if CONFIG['OS_ARCH'] == 'WINNT':
LOCAL_INCLUDES += [
'/toolkit/xre',
]
+ USE_LIBS += [
+ 'updatecommon-standalone',
+ ]
OS_LIBS += [
'comctl32',
'ws2_32',