diff --git a/CHANGELOG.md b/CHANGELOG.md index 8478e481..0eef5a8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Updated [adbkit](https://github.com/openstf/adbkit) to resolve an issue where trailing spaces in an adb public key would cause an error during adb connect. - Updated [adbkit](https://github.com/openstf/adbkit) to resolve issues with log parsing on Android 7.0 and later, caused by Android no longer transforming `\n` to `\r\n`. - Updated [adbkit](https://github.com/openstf/adbkit) to resolve an issue with recent versions of ADB that include a null byte in `adbkey.pub`, which was causing validation to fail. +- Fixed [minitouch](https://github.com/openstf/minitouch) on Blackberry PRIV. ### Misc diff --git a/lib/units/device/resources/minitouch.js b/lib/units/device/resources/minitouch.js index f0a8d472..5c59138b 100644 --- a/lib/units/device/resources/minitouch.js +++ b/lib/units/device/resources/minitouch.js @@ -19,8 +19,8 @@ module.exports = syrup.serial() var resources = { bin: new Resource({ src: pathutil.requiredMatch(abi.all.map(function(supportedAbi) { - return pathutil.vendor(util.format( - 'minitouch/%s/minitouch%s' + return pathutil.module(util.format( + 'minitouch-prebuilt/prebuilt/%s/bin/minitouch%s' , supportedAbi , abi.pie ? '' : '-nopie' )) diff --git a/package.json b/package.json index bfb4ef0a..736bbeaf 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "mime": "^1.3.4", "minicap-prebuilt": "^1.4.0", "minimatch": "^3.0.3", + "minitouch-prebuilt": "^1.0.0", "my-local-ip": "^1.0.0", "openid": "^2.0.1", "passport": "^0.3.2", diff --git a/vendor/minitouch/arm64-v8a/minitouch b/vendor/minitouch/arm64-v8a/minitouch deleted file mode 100755 index cce66ca8..00000000 Binary files a/vendor/minitouch/arm64-v8a/minitouch and /dev/null differ diff --git a/vendor/minitouch/arm64-v8a/minitouch-nopie b/vendor/minitouch/arm64-v8a/minitouch-nopie deleted file mode 100755 index cce66ca8..00000000 Binary files a/vendor/minitouch/arm64-v8a/minitouch-nopie and /dev/null differ diff --git a/vendor/minitouch/armeabi-v7a/minitouch b/vendor/minitouch/armeabi-v7a/minitouch deleted file mode 100755 index 19a9e830..00000000 Binary files a/vendor/minitouch/armeabi-v7a/minitouch and /dev/null differ diff --git a/vendor/minitouch/armeabi-v7a/minitouch-nopie b/vendor/minitouch/armeabi-v7a/minitouch-nopie deleted file mode 100755 index f3604477..00000000 Binary files a/vendor/minitouch/armeabi-v7a/minitouch-nopie and /dev/null differ diff --git a/vendor/minitouch/armeabi/minitouch b/vendor/minitouch/armeabi/minitouch deleted file mode 100755 index 732ef911..00000000 Binary files a/vendor/minitouch/armeabi/minitouch and /dev/null differ diff --git a/vendor/minitouch/armeabi/minitouch-nopie b/vendor/minitouch/armeabi/minitouch-nopie deleted file mode 100755 index 5c658278..00000000 Binary files a/vendor/minitouch/armeabi/minitouch-nopie and /dev/null differ diff --git a/vendor/minitouch/mips/minitouch b/vendor/minitouch/mips/minitouch deleted file mode 100755 index 743b852c..00000000 Binary files a/vendor/minitouch/mips/minitouch and /dev/null differ diff --git a/vendor/minitouch/mips/minitouch-nopie b/vendor/minitouch/mips/minitouch-nopie deleted file mode 100755 index b33a5cd6..00000000 Binary files a/vendor/minitouch/mips/minitouch-nopie and /dev/null differ diff --git a/vendor/minitouch/mips64/minitouch b/vendor/minitouch/mips64/minitouch deleted file mode 100755 index 1a90673a..00000000 Binary files a/vendor/minitouch/mips64/minitouch and /dev/null differ diff --git a/vendor/minitouch/mips64/minitouch-nopie b/vendor/minitouch/mips64/minitouch-nopie deleted file mode 100755 index 1a90673a..00000000 Binary files a/vendor/minitouch/mips64/minitouch-nopie and /dev/null differ diff --git a/vendor/minitouch/x86/minitouch b/vendor/minitouch/x86/minitouch deleted file mode 100755 index 3ea4ffdd..00000000 Binary files a/vendor/minitouch/x86/minitouch and /dev/null differ diff --git a/vendor/minitouch/x86/minitouch-nopie b/vendor/minitouch/x86/minitouch-nopie deleted file mode 100755 index 818b3128..00000000 Binary files a/vendor/minitouch/x86/minitouch-nopie and /dev/null differ diff --git a/vendor/minitouch/x86_64/minitouch b/vendor/minitouch/x86_64/minitouch deleted file mode 100755 index 38ca23e3..00000000 Binary files a/vendor/minitouch/x86_64/minitouch and /dev/null differ diff --git a/vendor/minitouch/x86_64/minitouch-nopie b/vendor/minitouch/x86_64/minitouch-nopie deleted file mode 100755 index 38ca23e3..00000000 Binary files a/vendor/minitouch/x86_64/minitouch-nopie and /dev/null differ