yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-03 09:49:17 +02:00
Code Issues Releases Wiki Activity

Correct prebuilt binaries paths

Browse source
This commit is contained in:
Karol Wrótniak 2020-02-08 17:24:36 +01:00
parent 8deae20510
commit 9dfb09e32c
No known key found for this signature in database
GPG key ID: DE1EED7FE32385FE
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/units/device/resources/minicap.js
View file

@ -23,7 +23,7 @@ module.exports = syrup.serial()
bin: new Resource({ bin: new Resource({
src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) { src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) {
return pathutil.module(util.format( return pathutil.module(util.format(
'minicap-prebuilt/prebuilt/%s/bin/minicap%s' 'minicap-prebuilt-beta/prebuilt/%s/bin/minicap%s'
, supportedAbi , supportedAbi
, abi.pie ? '' : '-nopie' , abi.pie ? '' : '-nopie'
)) ))
@ -41,12 +41,12 @@ module.exports = syrup.serial()
src: pathutil.requiredMatch(abi.all.reduce(function(all, supportedAbi) { src: pathutil.requiredMatch(abi.all.reduce(function(all, supportedAbi) {
return all.concat([ return all.concat([
pathutil.module(util.format( pathutil.module(util.format(
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so' 'minicap-prebuilt-beta/prebuilt/%s/lib/android-%s/minicap.so'
, supportedAbi , supportedAbi
, sdk.previewLevel , sdk.previewLevel
)) ))
, pathutil.module(util.format( , pathutil.module(util.format(
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so' 'minicap-prebuilt-beta/prebuilt/%s/lib/android-%s/minicap.so'
, supportedAbi , supportedAbi
, sdk.level , sdk.level
)) ))

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

@ -20,7 +20,7 @@ module.exports = syrup.serial()
bin: new Resource({ bin: new Resource({
src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) { src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) {
return pathutil.module(util.format( return pathutil.module(util.format(
'minitouch-prebuilt/prebuilt/%s/bin/minitouch%s' 'minitouch-prebuilt-beta/prebuilt/%s/bin/minitouch%s'
, supportedAbi , supportedAbi
, abi.pie ? '' : '-nopie' , abi.pie ? '' : '-nopie'
)) ))