From 4a7951c4ceecfb8b2e327554fc619f5e54d06be1 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 20 Feb 2019 19:10:31 +0100
Subject: [PATCH] Restore building of common-standalone lib for updater.

Tag #145
---
 toolkit/moz.build                                   | 8 ++++++++
 toolkit/mozapps/update/updater/updater-common.build | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/toolkit/moz.build b/toolkit/moz.build
index c2bf901b6a..3951700b96 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -30,6 +30,14 @@ else:
 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 7b7ee35bb0..6444df8d9b 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',