From e6b48cb648c7ec7f355fbdd7fd638e472a2aee93 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Wed, 19 Feb 2020 15:05:50 -0500
Subject: Issue #1454 - Add MOZ_PKG_SPECIAL to UpdateUtils

---
 toolkit/modules/UpdateUtils.jsm | 4 ++++
 toolkit/modules/moz.build       | 1 +
 2 files changed, 5 insertions(+)

(limited to 'toolkit')

diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm
index 704fe116d..a84125be5 100644
--- a/toolkit/modules/UpdateUtils.jsm
+++ b/toolkit/modules/UpdateUtils.jsm
@@ -3,6 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #filter substitution
+#if !MOZ_PKG_SPECIAL
+#define MOZ_PKG_SPECIAL false
+#endif
 
 this.EXPORTED_SYMBOLS = ["UpdateUtils"];
 
@@ -70,6 +73,7 @@ this.UpdateUtils = {
     url = url.replace(/%VERSION%/g, Services.appinfo.version);
     url = url.replace(/%BUILD_ID%/g, Services.appinfo.appBuildID);
     url = url.replace(/%BUILD_TARGET%/g, Services.appinfo.OS + "_" + this.ABI);
+    url = url.replace(/%BUILD_SPECIAL%/g, "@MOZ_PKG_SPECIAL@");
     url = url.replace(/%OS_VERSION%/g, this.OSVersion);
     url = url.replace(/%WIDGET_TOOLKIT%/g, "@MOZ_WIDGET_TOOLKIT@");
     url = url.replace(/%CHANNEL%/g, this.UpdateChannel);
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index a6423913d..c9d3fc7a0 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -139,6 +139,7 @@ for var in ('ANDROID_PACKAGE_NAME',
             'MOZ_APP_VERSION_DISPLAY',
             'MOZ_MACBUNDLE_NAME',
             'MOZ_WIDGET_TOOLKIT',
+            'MOZ_PKG_SPECIAL',
             'DLL_PREFIX',
             'DLL_SUFFIX',
             'DEBUG_JS_MODULES'):
-- 
cgit v1.2.3