Bug 1378835 - use Services.appinfo instead of sdk/system/runtime in WebIDE;r=ochameau
authorJulian Descottes <jdescottes@mozilla.com>
Mon, 24 Jul 2017 23:02:00 +0200
changeset 419553 220a017bd68128fb1795c2bb81bd061772ce9fef
parent 419552 4a683249128b690ce5fea932305dee8460efd3f8
child 419554 c6d36106525ba7b65a3587d643c3b145de80fb99
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersochameau
bugs1378835
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1378835 - use Services.appinfo instead of sdk/system/runtime in WebIDE;r=ochameau MozReview-Commit-ID: 6Z55YIPOcyN
devtools/client/webide/modules/simulator-process.js
--- a/devtools/client/webide/modules/simulator-process.js
+++ b/devtools/client/webide/modules/simulator-process.js
@@ -8,22 +8,21 @@
 const { Cc, Ci, Cu } = require("chrome");
 
 const Environment = require("sdk/system/environment").env;
 const EventEmitter = require("devtools/shared/event-emitter");
 const Subprocess = require("sdk/system/child_process/subprocess");
 const Services = require("Services");
 
 loader.lazyGetter(this, "OS", () => {
-  const Runtime = require("sdk/system/runtime");
-  switch (Runtime.OS) {
+  switch (Services.appinfo.OS) {
     case "Darwin":
       return "mac64";
     case "Linux":
-      if (Runtime.XPCOMABI.indexOf("x86_64") === 0) {
+      if (Services.appinfo.XPCOMABI.indexOf("x86_64") === 0) {
         return "linux64";
       } else {
         return "linux32";
       }
     case "WINNT":
       return "win32";
     default:
       return "";