diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-13 23:23:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 23:23:55 +0200 |
| commit | faa4a1c44f200c77a7e6ba0a559c1309653fda38 (patch) | |
| tree | 937782cb6f5d5a12780a08261d98e3c86a732a34 /toolkit/modules | |
| parent | b2cb0427838a2f4f51be0366004549efb5d206fb (diff) | |
| parent | e08b25667f20c83cd66e7f55dd98f16ae982974b (diff) | |
| download | UXP-faa4a1c44f200c77a7e6ba0a559c1309653fda38.tar UXP-faa4a1c44f200c77a7e6ba0a559c1309653fda38.tar.gz UXP-faa4a1c44f200c77a7e6ba0a559c1309653fda38.tar.lz UXP-faa4a1c44f200c77a7e6ba0a559c1309653fda38.tar.xz UXP-faa4a1c44f200c77a7e6ba0a559c1309653fda38.zip | |
Merge pull request #493 from janekptacijarabaci/toolkit_version_architecture_1
Add architecture detection to "about:" and "about:support"
Diffstat (limited to 'toolkit/modules')
| -rw-r--r-- | toolkit/modules/Troubleshoot.jsm | 6 | ||||
| -rw-r--r-- | toolkit/modules/moz.build | 6 |
2 files changed, 10 insertions, 2 deletions
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'] |