Convert to packed add-on

Makefile

@@ -1,4 +1,4 @@
-FILES=adb.js adb-*.js bootstrap.js device.js devtools-import.js devtools-require.js events.js fastboot.js main.js scanner.js unload.js
+FILES=adb.js adb-*.js binary-manager.js bootstrap.js device.js devtools-import.js devtools-require.js events.js fastboot.js main.js scanner.js unload.js
 ADDON_NAME=adbhelper
 ADDON_VERSION=0.11.3pre
 XPI_NAME=$(ADDON_NAME)-$(ADDON_VERSION)

adb-client.js

@@ -7,13 +7,11 @@
  * Mostly from original `adb.js`
  */
 
-'use strict';
+"use strict";
 
-const { Cu, Cc, Ci } = require("chrome");
+const { Cu } = require("chrome");
 const { AdbSocket } = require("./adb-socket");
 
-Cu.import("resource://gre/modules/Services.jsm");
-
 // Starting with FF57, jsm share the same global and this require pulling it from it.
 const { TextEncoder, TextDecoder } =
   Cu.getGlobalForObject(Cu.import("resource://gre/modules/Services.jsm", {}));
@@ -42,14 +40,14 @@ function unpackPacket(aPacket, aIgnoreResponse) {
   let decoder = new TextDecoder();
   let length = parseInt(decoder.decode(lengthView), 16);
   let text = new Uint8Array(buffer, aIgnoreResponse ? 4 : 8, length);
-  return { length: length, data: decoder.decode(text) };
+  return { length, data: decoder.decode(text) };
 }
 
 // Checks if the response is expected (defaults to OKAY).
 // @return true if response equals expected.
 function checkResponse(aPacket, aExpected = OKAY) {
   let buffer = getBuffer(aPacket);
-  let view = new Uint32Array(buffer, 0 , 1);
+  let view = new Uint32Array(buffer, 0, 1);
   if (view[0] == FAIL) {
     console.debug("Response: FAIL");
   }
@@ -63,7 +61,7 @@ function checkResponse(aPacket, aExpected = OKAY) {
 // @return A 8 bit typed array.
 function createRequest(aCommand) {
   let length = aCommand.length.toString(16).toUpperCase();
-  while(length.length < 4) {
+  while (length.length < 4) {
     length = "0" + length;
   }
 
@@ -85,12 +83,12 @@ function connect() {
 }
 
 let client = {
-  getBuffer: getBuffer,
-  unpackPacket: unpackPacket,
-  checkResponse: checkResponse,
-  createRequest: createRequest,
-  connect: connect,
-  close: close
+  getBuffer,
+  unpackPacket,
+  checkResponse,
+  createRequest,
+  connect,
+  close
 };
 
 module.exports = client;

adb-running-checker.js

@@ -8,10 +8,9 @@
  * Modified from adb-file-transfer from original ADB
  */
 
-'use strict';
-
-const { Cu, Cc, Ci } = require("chrome");
+"use strict";
 
+const { Cu } = require("chrome");
 const { PromiseUtils } = Cu.import("resource://gre/modules/PromiseUtils.jsm", {});
 const client = require("./adb-client");
 
@@ -24,12 +23,12 @@ exports.check = function check() {
 
   let runFSM = function runFSM(aData) {
     console.debug("runFSM " + state);
-    switch(state) {
+    switch (state) {
       case "start":
         let req = client.createRequest("host:version");
         socket.send(req);
         state = "wait-version";
-        break
+        break;
       case "wait-version":
         // TODO: Actually check the version number to make sure the daemon
         //       supports the commands we want to use
@@ -60,7 +59,7 @@ exports.check = function check() {
       console.debug("running checker onopen");
       state = "start";
       runFSM();
-    }
+    };
 
     socket.s.onclose = function(aEvent) {
       console.debug("running checker onclose");

adb-socket.js

@@ -2,11 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-'use strict';
+"use strict";
 
-const { Cc, Ci, Cr, Cu } = require("chrome");
-
-Cu.import("resource://gre/modules/Services.jsm");
+const { Cu } = require("chrome");
+const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
 
 // Starting with FF57, jsm share the same global and this require pulling it from it.
 const { TextDecoder } =