mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-18 14:53:24 +02:00
Update minicap for Android 7.1 support. Use the new minicap-prebuilt
package instead of bundling the binaries in the repo.
This commit is contained in:
@@ -19,8 +19,8 @@ module.exports = syrup.serial()
|
||||
var resources = {
|
||||
bin: {
|
||||
src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) {
|
||||
return pathutil.vendor(util.format(
|
||||
'minicap/bin/%s/minicap%s'
|
||||
return pathutil.module(util.format(
|
||||
'minicap-prebuilt/prebuilt/%s/bin/minicap%s'
|
||||
, supportedAbi
|
||||
, abi.pie ? '' : '-nopie'
|
||||
))
|
||||
@@ -34,15 +34,15 @@ module.exports = syrup.serial()
|
||||
// have an x86_64 version of the binary while the lib supports it.
|
||||
src: pathutil.requiredMatch(abi.all.reduce(function(all, supportedAbi) {
|
||||
return all.concat([
|
||||
pathutil.vendor(util.format(
|
||||
'minicap/shared/android-%s/%s/minicap.so'
|
||||
pathutil.module(util.format(
|
||||
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
|
||||
, supportedAbi
|
||||
, properties['ro.build.version.release']
|
||||
, supportedAbi
|
||||
))
|
||||
, pathutil.vendor(util.format(
|
||||
'minicap/shared/android-%d/%s/minicap.so'
|
||||
, properties['ro.build.version.sdk']
|
||||
, pathutil.module(util.format(
|
||||
'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
|
||||
, supportedAbi
|
||||
, properties['ro.build.version.sdk']
|
||||
))
|
||||
])
|
||||
}, []))
|
||||
|
||||
Reference in New Issue
Block a user