starred/stf
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 12:53:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for Android O Developer Preview 1.

Browse Source
This commit is contained in:
Simo Kinnunen
2017-04-08 23:21:19 +09:00
parent 9fa11ac7ff
commit 43f0341297
8 changed files with 63 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/units/device/resources/minicap.js
View File

@@ -15,7 +15,8 @@ module.exports = syrup.serial()
.dependency(require('../support/adb'))
.dependency(require('../support/properties'))
.dependency(require('../support/abi'))
.define(function(options, adb, properties, abi) {
.dependency(require('../support/sdk'))
.define(function(options, adb, properties, abi, sdk) {
var log = logger.createLogger('device:resources:minicap')
var resources = {
@@ -42,12 +43,17 @@ module.exports = syrup.serial()
pathutil.module(util.format(
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
, supportedAbi
, properties['ro.build.version.release']
, sdk.release
))
, pathutil.module(util.format(
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
, supportedAbi
, properties['ro.build.version.sdk']
, sdk.previewLevel
))
, pathutil.module(util.format(
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
, supportedAbi
, sdk.level
))
])
}, []))
@@ -82,7 +88,7 @@ module.exports = syrup.serial()
}
function installResource(res) {
log.info('Installing "%s" as "%s"', res.comm, res.dest)
log.info('Installing "%s" as "%s"', res.src, res.dest)
function checkExecutable(res) {
return adb.stat(options.serial, res.dest)

17
lib/units/device/resources/minirev.js
View File

@@ -13,16 +13,19 @@ var Resource = require('./util/resource')
module.exports = syrup.serial()
.dependency(require('../support/adb'))
.dependency(require('../support/properties'))
.define(function(options, adb, properties) {
.dependency(require('../support/abi'))
.define(function(options, adb, properties, abi) {
var log = logger.createLogger('device:resources:minirev')
var resources = {
bin: new Resource({
src: pathutil.vendor(util.format(
'minirev/%s/minirev%s'
, properties['ro.product.cpu.abi']
, properties['ro.build.version.sdk'] < 16 ? '-nopie' : ''
))
src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) {
return pathutil.vendor(util.format(
'minirev/%s/minirev%s'
, supportedAbi
, abi.pie ? '' : '-nopie'
))
}))
, dest: [
'/data/local/tmp/minirev'
, '/data/data/com.android.shell/minirev'
@@ -54,7 +57,7 @@ module.exports = syrup.serial()
}
function installResource(res) {
log.info('Installing "%s" as "%s"', res.comm, res.dest)
log.info('Installing "%s" as "%s"', res.src, res.dest)
function checkExecutable(res) {
return adb.stat(options.serial, res.dest)

2
lib/units/device/resources/minitouch.js
View File

@@ -56,7 +56,7 @@ module.exports = syrup.serial()
}
function installResource(res) {
log.info('Installing "%s" as "%s"', res.comm, res.dest)
log.info('Installing "%s" as "%s"', res.src, res.dest)
function checkExecutable(res) {
return adb.stat(options.serial, res.dest)