diff --git a/lib/units/device/resources/minicap.js b/lib/units/device/resources/minicap.js index 041bd058..01e0a1cf 100644 --- a/lib/units/device/resources/minicap.js +++ b/lib/units/device/resources/minicap.js @@ -32,13 +32,20 @@ module.exports = syrup.serial() , lib: { // @todo The lib ABI should match the bin ABI. Currently we don't // have an x86_64 version of the binary while the lib supports it. - src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) { - return pathutil.vendor(util.format( - 'minicap/shared/android-%d/%s/minicap.so' - , properties['ro.build.version.sdk'] - , supportedAbi - )) - })) + src: pathutil.requiredMatch(abi.all.reduce(function(all, supportedAbi) { + return all.concat([ + pathutil.vendor(util.format( + 'minicap/shared/android-%s/%s/minicap.so' + , properties['ro.build.version.release'] + , supportedAbi + )) + , pathutil.vendor(util.format( + 'minicap/shared/android-%d/%s/minicap.so' + , properties['ro.build.version.sdk'] + , supportedAbi + )) + ]) + }, [])) , dest: '/data/local/tmp/minicap.so' , mode: 0755 } diff --git a/vendor/minicap/shared/android-M/arm64-v8a/minicap.so b/vendor/minicap/shared/android-M/arm64-v8a/minicap.so new file mode 100755 index 00000000..aaa7806f Binary files /dev/null and b/vendor/minicap/shared/android-M/arm64-v8a/minicap.so differ diff --git a/vendor/minicap/shared/android-M/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-M/armeabi-v7a/minicap.so new file mode 100755 index 00000000..55d26a35 Binary files /dev/null and b/vendor/minicap/shared/android-M/armeabi-v7a/minicap.so differ diff --git a/vendor/minicap/shared/android-M/x86/minicap.so b/vendor/minicap/shared/android-M/x86/minicap.so new file mode 100755 index 00000000..ce05ed75 Binary files /dev/null and b/vendor/minicap/shared/android-M/x86/minicap.so differ diff --git a/vendor/minicap/shared/android-M/x86_64/minicap.so b/vendor/minicap/shared/android-M/x86_64/minicap.so new file mode 100755 index 00000000..39fbe455 Binary files /dev/null and b/vendor/minicap/shared/android-M/x86_64/minicap.so differ