diff --git a/lib/units/device/plugins/stats.js b/lib/units/device/plugins/stats.js deleted file mode 100644 index 1595d467..00000000 --- a/lib/units/device/plugins/stats.js +++ /dev/null @@ -1,46 +0,0 @@ -var syrup = require('stf-syrup') - -var logger = require('../../../util/logger') -var devutil = require('../../../util/devutil') -var lifecycle = require('../../../util/lifecycle') -var streamutil = require('../../../util/streamutil') - -module.exports = syrup.serial() - .dependency(require('../support/adb')) - .dependency(require('../resources/remote')) - .define(function(options, adb, remote) { - var log = logger.createLogger('device:plugins:stats') - - var service = { - port: 2830 - } - - function openService() { - return devutil.ensureUnusedPort(adb, options.serial, service.port) - .timeout(10000) - .then(function() { - return adb.shell(options.serial, [ - remote.bin - , '--lib', remote.lib - , '--listen-stats', service.port - ]) - .timeout(10000) - .then(function(out) { - lifecycle.share('Stats shell', out) - streamutil.talk(log, 'Stats shell says: "%s"', out) - }) - }) - .then(function() { - return devutil.waitForPort(adb, options.serial, service.port) - .timeout(15000) - }) - .then(function(conn) { - return lifecycle.share('Stats connection', conn) - }) - } - - return openService() - .then(function() { - return {} - }) - }) diff --git a/lib/units/device/resources/remote.js b/lib/units/device/resources/remote.js deleted file mode 100644 index 8f8a7730..00000000 --- a/lib/units/device/resources/remote.js +++ /dev/null @@ -1,110 +0,0 @@ -var util = require('util') - -var Promise = require('bluebird') -var syrup = require('stf-syrup') - -var logger = require('../../../util/logger') -var pathutil = require('../../../util/pathutil') -var devutil = require('../../../util/devutil') -var streamutil = require('../../../util/streamutil') - -module.exports = syrup.serial() - .dependency(require('../support/adb')) - .dependency(require('../support/properties')) - .dependency(require('../support/abi')) - .define(function(options, adb, properties, abi) { - var log = logger.createLogger('device:resources:remote') - - var resources = { - bin: { - src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) { - return pathutil.vendor(util.format( - 'remote/libs/%s/remote%s' - , supportedAbi - , abi.pie ? '' : '-nopie' - )) - })) - , dest: '/data/local/tmp/remote' - , comm: 'remote' - , mode: 0755 - } - , lib: { - src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) { - return pathutil.vendor(util.format( - 'remote/external/android-%d/%s/remote_external.so' - , properties['ro.build.version.sdk'] - , supportedAbi - )) - })) - , dest: '/data/local/tmp/remote_external.so' - , mode: 0755 - } - } - - function removeResource(res) { - return adb.shell(options.serial, ['rm', res.dest]) - .timeout(10000) - .then(function(out) { - return streamutil.readAll(out) - }) - .return(res) - } - - function installResource(res) { - return adb.push(options.serial, res.src, res.dest, res.mode) - .timeout(10000) - .then(function(transfer) { - return new Promise(function(resolve, reject) { - transfer.on('error', reject) - transfer.on('end', resolve) - }) - }) - .return(res) - } - - function ensureNotBusy(res) { - return adb.shell(options.serial, [res.dest, '--help']) - .timeout(10000) - .then(function(out) { - // Can be "Text is busy", "text busy" - return streamutil.findLine(out, (/busy/i)) - .timeout(10000) - .then(function() { - log.info('Binary is busy, will retry') - return Promise.delay(1000) - }) - .then(function() { - return ensureNotBusy(res) - }) - .catch(streamutil.NoSuchLineError, function() { - return res - }) - }) - } - - function installAll() { - return Promise.all([ - removeResource(resources.bin).then(installResource).then(ensureNotBusy) - , removeResource(resources.lib).then(installResource) - ]) - } - - function stop() { - return devutil.killProcsByComm( - adb - , options.serial - , resources.bin.comm - , resources.bin.dest - ) - .timeout(15000) - } - - return stop() - .then(installAll) - .then(function() { - return { - bin: resources.bin.dest - , lib: resources.lib.dest - } - }) - }) diff --git a/vendor/remote/external/android-10/armeabi-v7a/remote_external.so b/vendor/remote/external/android-10/armeabi-v7a/remote_external.so deleted file mode 100755 index e2d8740c..00000000 Binary files a/vendor/remote/external/android-10/armeabi-v7a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-14/armeabi-v7a/remote_external.so b/vendor/remote/external/android-14/armeabi-v7a/remote_external.so deleted file mode 100755 index 7a00982a..00000000 Binary files a/vendor/remote/external/android-14/armeabi-v7a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-14/x86/remote_external.so b/vendor/remote/external/android-14/x86/remote_external.so deleted file mode 100755 index e18b3593..00000000 Binary files a/vendor/remote/external/android-14/x86/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-15/armeabi-v7a/remote_external.so b/vendor/remote/external/android-15/armeabi-v7a/remote_external.so deleted file mode 100755 index 76bdf491..00000000 Binary files a/vendor/remote/external/android-15/armeabi-v7a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-15/x86/remote_external.so b/vendor/remote/external/android-15/x86/remote_external.so deleted file mode 100755 index b81c2c42..00000000 Binary files a/vendor/remote/external/android-15/x86/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-16/armeabi-v7a/remote_external.so b/vendor/remote/external/android-16/armeabi-v7a/remote_external.so deleted file mode 100755 index 1ad93c59..00000000 Binary files a/vendor/remote/external/android-16/armeabi-v7a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-16/x86/remote_external.so b/vendor/remote/external/android-16/x86/remote_external.so deleted file mode 100755 index 053519b9..00000000 Binary files a/vendor/remote/external/android-16/x86/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-17/armeabi-v7a/remote_external.so b/vendor/remote/external/android-17/armeabi-v7a/remote_external.so deleted file mode 100755 index 9fad222e..00000000 Binary files a/vendor/remote/external/android-17/armeabi-v7a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-17/x86/remote_external.so b/vendor/remote/external/android-17/x86/remote_external.so deleted file mode 100755 index 1fd22ff4..00000000 Binary files a/vendor/remote/external/android-17/x86/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-18/armeabi-v7a/remote_external.so b/vendor/remote/external/android-18/armeabi-v7a/remote_external.so deleted file mode 100755 index 51e359d8..00000000 Binary files a/vendor/remote/external/android-18/armeabi-v7a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-18/x86/remote_external.so b/vendor/remote/external/android-18/x86/remote_external.so deleted file mode 100755 index e9b31bba..00000000 Binary files a/vendor/remote/external/android-18/x86/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-19/armeabi-v7a/remote_external.so b/vendor/remote/external/android-19/armeabi-v7a/remote_external.so deleted file mode 100755 index 2e4f3c67..00000000 Binary files a/vendor/remote/external/android-19/armeabi-v7a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-19/x86/remote_external.so b/vendor/remote/external/android-19/x86/remote_external.so deleted file mode 100755 index 4d2c4c79..00000000 Binary files a/vendor/remote/external/android-19/x86/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-21/arm64-v8a/remote_external.so b/vendor/remote/external/android-21/arm64-v8a/remote_external.so deleted file mode 100755 index 3f5face3..00000000 Binary files a/vendor/remote/external/android-21/arm64-v8a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-21/armeabi-v7a/remote_external.so b/vendor/remote/external/android-21/armeabi-v7a/remote_external.so deleted file mode 100755 index b412fbc8..00000000 Binary files a/vendor/remote/external/android-21/armeabi-v7a/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-21/x86/remote_external.so b/vendor/remote/external/android-21/x86/remote_external.so deleted file mode 100755 index 846febd7..00000000 Binary files a/vendor/remote/external/android-21/x86/remote_external.so and /dev/null differ diff --git a/vendor/remote/external/android-21/x86_64/remote_external.so b/vendor/remote/external/android-21/x86_64/remote_external.so deleted file mode 100755 index f324a21b..00000000 Binary files a/vendor/remote/external/android-21/x86_64/remote_external.so and /dev/null differ diff --git a/vendor/remote/libs/arm64-v8a/remote b/vendor/remote/libs/arm64-v8a/remote deleted file mode 100755 index 34133c60..00000000 Binary files a/vendor/remote/libs/arm64-v8a/remote and /dev/null differ diff --git a/vendor/remote/libs/arm64-v8a/remote-nopie b/vendor/remote/libs/arm64-v8a/remote-nopie deleted file mode 100755 index 34133c60..00000000 Binary files a/vendor/remote/libs/arm64-v8a/remote-nopie and /dev/null differ diff --git a/vendor/remote/libs/armeabi-v7a/remote b/vendor/remote/libs/armeabi-v7a/remote deleted file mode 100755 index a9f51b69..00000000 Binary files a/vendor/remote/libs/armeabi-v7a/remote and /dev/null differ diff --git a/vendor/remote/libs/armeabi-v7a/remote-nopie b/vendor/remote/libs/armeabi-v7a/remote-nopie deleted file mode 100755 index 3eaeeef9..00000000 Binary files a/vendor/remote/libs/armeabi-v7a/remote-nopie and /dev/null differ diff --git a/vendor/remote/libs/x86/remote b/vendor/remote/libs/x86/remote deleted file mode 100755 index 9a9f03b6..00000000 Binary files a/vendor/remote/libs/x86/remote and /dev/null differ diff --git a/vendor/remote/libs/x86/remote-nopie b/vendor/remote/libs/x86/remote-nopie deleted file mode 100755 index 233b7a81..00000000 Binary files a/vendor/remote/libs/x86/remote-nopie and /dev/null differ