1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 02:29:26 +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:
Simo Kinnunen 2016-10-24 01:37:05 +09:00
parent d015da835b
commit dd24a9fe4b
44 changed files with 10 additions and 8 deletions

View file

@ -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']
))
])
}, []))

View file

@ -59,6 +59,7 @@
"lodash": "^4.14.2",
"markdown-serve": "^0.3.2",
"mime": "^1.3.4",
"minicap-prebuilt": "^1.0.0",
"minimatch": "^3.0.3",
"my-local-ip": "^1.0.0",
"node-uuid": "^1.4.3",
@ -127,6 +128,7 @@
"less": "^2.4.0",
"less-loader": "^2.2.2",
"memory-fs": "^0.3.0",
"minicap-prebuilt": "^1.0.0",
"node-libs-browser": "^1.0.0",
"node-sass": "^3.4.2",
"phantomjs-prebuilt": "^2.1.11",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.