Bug 1492700 - Move Devices.jsm to devtools/shared/adb folder;r=daisuke
authorJulian Descottes <jdescottes@mozilla.com>
Tue, 27 Nov 2018 12:49:49 +0000
changeset 504691 7590eb03b4ff904b41bdc7f8a17a73eda4f06da7
parent 504690 5199632a4ada777750accd0e0e2a0faa96b12d7e
child 504692 363e8b2ecfabea51817b7531a77366f0a62d0208
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdaisuke
bugs1492700
milestone65.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 1492700 - Move Devices.jsm to devtools/shared/adb folder;r=daisuke Depends on D12759 Differential Revision: https://phabricator.services.mozilla.com/D12760
devtools/shared/adb/Devices.jsm
devtools/shared/adb/adb-scanner.js
devtools/shared/adb/moz.build
devtools/shared/apps/Devices.jsm
devtools/shared/apps/moz.build
devtools/shared/moz.build
rename from devtools/shared/apps/Devices.jsm
rename to devtools/shared/adb/Devices.jsm
--- a/devtools/shared/adb/adb-scanner.js
+++ b/devtools/shared/adb/adb-scanner.js
@@ -1,20 +1,21 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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";
 
 const EventEmitter = require("devtools/shared/event-emitter");
-const { Devices } = require("devtools/shared/apps/Devices.jsm");
 const { dumpn } = require("devtools/shared/DevToolsUtils");
 const { RuntimeTypes } =
   require("devtools/client/webide/modules/runtime-types");
 const { ADB } = require("devtools/shared/adb/adb");
+const { Devices } = require("devtools/shared/adb/Devices.jsm");
+
 loader.lazyRequireGetter(this, "Device", "devtools/shared/adb/adb-device");
 
 class ADBScanner extends EventEmitter {
   constructor() {
     super();
     this._runtimes = [];
 
     this._onDeviceConnected = this._onDeviceConnected.bind(this);
--- a/devtools/shared/adb/moz.build
+++ b/devtools/shared/adb/moz.build
@@ -7,14 +7,15 @@ DevToolsModules(
     'adb-binary.js',
     'adb-client.js',
     'adb-device.js',
     'adb-running-checker.js',
     'adb-scanner.js',
     'adb-socket.js',
     'adb.js',
     'addon-aware-adb-scanner.js',
+    'Devices.jsm',
 )
 
 with Files('**'):
     BUG_COMPONENT = ('DevTools', 'about:debugging')
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
deleted file mode 100644
--- a/devtools/shared/apps/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DevToolsModules(
-    'Devices.jsm'
-)
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -4,17 +4,16 @@
 # 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/.
 
 include('../templates.mozbuild')
 
 DIRS += [
     'acorn',
     'adb',
-    'apps',
     'client',
     'css',
     'discovery',
     'fronts',
     'heapsnapshot',
     'inspector',
     'jsbeautify',
     'layout',