From e08b25667f20c83cd66e7f55dd98f16ae982974b Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Wed, 13 Jun 2018 17:31:46 +0200
Subject: Add architecture detection to "about:" and "about:support"

Issue #492
---
 toolkit/modules/Troubleshoot.jsm | 6 ++++++
 toolkit/modules/moz.build        | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'toolkit/modules')

diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
index 42f3fb809..daf6d99e6 100644
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -188,6 +188,12 @@ var dataProviders = {
     if (AppConstants.MOZ_UPDATER)
       data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel;
 
+#ifdef HAVE_64BIT_BUILD
+    data.versionArch = "64-bit";
+#else
+    data.versionArch = "32-bit";
+#endif
+
     try {
       data.vendor = Services.prefs.getCharPref("app.support.vendor");
     }
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 60f3cc3da..e288d11c8 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -94,7 +94,6 @@ EXTRA_JS_MODULES += [
     'Sqlite.jsm',
     'Task.jsm',
     'Timer.jsm',
-    'Troubleshoot.jsm',
     'UpdateUtils.jsm',
     'WebChannel.jsm',
     'WindowDraggingUtils.jsm',
@@ -103,7 +102,10 @@ EXTRA_JS_MODULES += [
 EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
 EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
 
-EXTRA_PP_JS_MODULES += ['NewTabUtils.jsm']
+EXTRA_PP_JS_MODULES += [
+    'NewTabUtils.jsm',
+    'Troubleshoot.jsm',
+]
 
 if not CONFIG['MOZ_WEBEXTENSIONS']:
   EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm']
-- 
cgit v1.2.3