diff --git a/lib/units/device/resources/minicap.js b/lib/units/device/resources/minicap.js index 67189bf2..52d85a55 100644 --- a/lib/units/device/resources/minicap.js +++ b/lib/units/device/resources/minicap.js @@ -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'] )) ]) }, [])) diff --git a/package.json b/package.json index f901fba0..55c3250e 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/vendor/minicap/bin/arm64-v8a/minicap b/vendor/minicap/bin/arm64-v8a/minicap deleted file mode 100755 index 204fba78..00000000 Binary files a/vendor/minicap/bin/arm64-v8a/minicap and /dev/null differ diff --git a/vendor/minicap/bin/arm64-v8a/minicap-nopie b/vendor/minicap/bin/arm64-v8a/minicap-nopie deleted file mode 100755 index 204fba78..00000000 Binary files a/vendor/minicap/bin/arm64-v8a/minicap-nopie and /dev/null differ diff --git a/vendor/minicap/bin/armeabi-v7a/minicap b/vendor/minicap/bin/armeabi-v7a/minicap deleted file mode 100755 index 1d3657ca..00000000 Binary files a/vendor/minicap/bin/armeabi-v7a/minicap and /dev/null differ diff --git a/vendor/minicap/bin/armeabi-v7a/minicap-nopie b/vendor/minicap/bin/armeabi-v7a/minicap-nopie deleted file mode 100755 index a7ba78a1..00000000 Binary files a/vendor/minicap/bin/armeabi-v7a/minicap-nopie and /dev/null differ diff --git a/vendor/minicap/bin/x86/minicap b/vendor/minicap/bin/x86/minicap deleted file mode 100755 index d1ee1e3b..00000000 Binary files a/vendor/minicap/bin/x86/minicap and /dev/null differ diff --git a/vendor/minicap/bin/x86/minicap-nopie b/vendor/minicap/bin/x86/minicap-nopie deleted file mode 100755 index 1a4ca3b0..00000000 Binary files a/vendor/minicap/bin/x86/minicap-nopie and /dev/null differ diff --git a/vendor/minicap/bin/x86_64/minicap b/vendor/minicap/bin/x86_64/minicap deleted file mode 100755 index a8c68c1b..00000000 Binary files a/vendor/minicap/bin/x86_64/minicap and /dev/null differ diff --git a/vendor/minicap/bin/x86_64/minicap-nopie b/vendor/minicap/bin/x86_64/minicap-nopie deleted file mode 100755 index a8c68c1b..00000000 Binary files a/vendor/minicap/bin/x86_64/minicap-nopie and /dev/null differ diff --git a/vendor/minicap/shared/android-10/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-10/armeabi-v7a/minicap.so deleted file mode 100755 index 70a42dc4..00000000 Binary files a/vendor/minicap/shared/android-10/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-14/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-14/armeabi-v7a/minicap.so deleted file mode 100755 index d0a2d870..00000000 Binary files a/vendor/minicap/shared/android-14/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-14/x86/minicap.so b/vendor/minicap/shared/android-14/x86/minicap.so deleted file mode 100755 index 0a7f7399..00000000 Binary files a/vendor/minicap/shared/android-14/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-15/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-15/armeabi-v7a/minicap.so deleted file mode 100755 index 9f2714a6..00000000 Binary files a/vendor/minicap/shared/android-15/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-15/x86/minicap.so b/vendor/minicap/shared/android-15/x86/minicap.so deleted file mode 100755 index 9ac43b81..00000000 Binary files a/vendor/minicap/shared/android-15/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-16/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-16/armeabi-v7a/minicap.so deleted file mode 100755 index d7eab0fe..00000000 Binary files a/vendor/minicap/shared/android-16/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-16/x86/minicap.so b/vendor/minicap/shared/android-16/x86/minicap.so deleted file mode 100755 index ad8c1049..00000000 Binary files a/vendor/minicap/shared/android-16/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-17/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-17/armeabi-v7a/minicap.so deleted file mode 100755 index 37369bec..00000000 Binary files a/vendor/minicap/shared/android-17/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-17/x86/minicap.so b/vendor/minicap/shared/android-17/x86/minicap.so deleted file mode 100755 index 3079f780..00000000 Binary files a/vendor/minicap/shared/android-17/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-18/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-18/armeabi-v7a/minicap.so deleted file mode 100755 index c2c80977..00000000 Binary files a/vendor/minicap/shared/android-18/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-18/x86/minicap.so b/vendor/minicap/shared/android-18/x86/minicap.so deleted file mode 100755 index e7d1c3b8..00000000 Binary files a/vendor/minicap/shared/android-18/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-19/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-19/armeabi-v7a/minicap.so deleted file mode 100755 index 46dadb8a..00000000 Binary files a/vendor/minicap/shared/android-19/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-19/x86/minicap.so b/vendor/minicap/shared/android-19/x86/minicap.so deleted file mode 100755 index 67092161..00000000 Binary files a/vendor/minicap/shared/android-19/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-21/arm64-v8a/minicap.so b/vendor/minicap/shared/android-21/arm64-v8a/minicap.so deleted file mode 100755 index 30954afc..00000000 Binary files a/vendor/minicap/shared/android-21/arm64-v8a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-21/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-21/armeabi-v7a/minicap.so deleted file mode 100755 index 39f1b624..00000000 Binary files a/vendor/minicap/shared/android-21/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-21/x86/minicap.so b/vendor/minicap/shared/android-21/x86/minicap.so deleted file mode 100755 index 3e77d6c6..00000000 Binary files a/vendor/minicap/shared/android-21/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-21/x86_64/minicap.so b/vendor/minicap/shared/android-21/x86_64/minicap.so deleted file mode 100755 index 9ccc8058..00000000 Binary files a/vendor/minicap/shared/android-21/x86_64/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-22/arm64-v8a/minicap.so b/vendor/minicap/shared/android-22/arm64-v8a/minicap.so deleted file mode 100755 index 9464fa55..00000000 Binary files a/vendor/minicap/shared/android-22/arm64-v8a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-22/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-22/armeabi-v7a/minicap.so deleted file mode 100755 index 899a65cf..00000000 Binary files a/vendor/minicap/shared/android-22/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-22/x86/minicap.so b/vendor/minicap/shared/android-22/x86/minicap.so deleted file mode 100755 index 26cba093..00000000 Binary files a/vendor/minicap/shared/android-22/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-22/x86_64/minicap.so b/vendor/minicap/shared/android-22/x86_64/minicap.so deleted file mode 100755 index dda8e341..00000000 Binary files a/vendor/minicap/shared/android-22/x86_64/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-23/arm64-v8a/minicap.so b/vendor/minicap/shared/android-23/arm64-v8a/minicap.so deleted file mode 100755 index 18bbfda6..00000000 Binary files a/vendor/minicap/shared/android-23/arm64-v8a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-23/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-23/armeabi-v7a/minicap.so deleted file mode 100755 index 61995812..00000000 Binary files a/vendor/minicap/shared/android-23/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-23/x86/minicap.so b/vendor/minicap/shared/android-23/x86/minicap.so deleted file mode 100755 index d4ed08ea..00000000 Binary files a/vendor/minicap/shared/android-23/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-23/x86_64/minicap.so b/vendor/minicap/shared/android-23/x86_64/minicap.so deleted file mode 100755 index 967e4f40..00000000 Binary files a/vendor/minicap/shared/android-23/x86_64/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-24/arm64-v8a/minicap.so b/vendor/minicap/shared/android-24/arm64-v8a/minicap.so deleted file mode 100755 index 18bbfda6..00000000 Binary files a/vendor/minicap/shared/android-24/arm64-v8a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-24/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-24/armeabi-v7a/minicap.so deleted file mode 100755 index 61995812..00000000 Binary files a/vendor/minicap/shared/android-24/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-24/x86/minicap.so b/vendor/minicap/shared/android-24/x86/minicap.so deleted file mode 100755 index d4ed08ea..00000000 Binary files a/vendor/minicap/shared/android-24/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-24/x86_64/minicap.so b/vendor/minicap/shared/android-24/x86_64/minicap.so deleted file mode 100755 index 967e4f40..00000000 Binary files a/vendor/minicap/shared/android-24/x86_64/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-9/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-9/armeabi-v7a/minicap.so deleted file mode 100755 index 70a42dc4..00000000 Binary files a/vendor/minicap/shared/android-9/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-M/arm64-v8a/minicap.so b/vendor/minicap/shared/android-M/arm64-v8a/minicap.so deleted file mode 100755 index 18bbfda6..00000000 Binary files a/vendor/minicap/shared/android-M/arm64-v8a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-M/armeabi-v7a/minicap.so b/vendor/minicap/shared/android-M/armeabi-v7a/minicap.so deleted file mode 100755 index 61995812..00000000 Binary files a/vendor/minicap/shared/android-M/armeabi-v7a/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-M/x86/minicap.so b/vendor/minicap/shared/android-M/x86/minicap.so deleted file mode 100755 index d4ed08ea..00000000 Binary files a/vendor/minicap/shared/android-M/x86/minicap.so and /dev/null differ diff --git a/vendor/minicap/shared/android-M/x86_64/minicap.so b/vendor/minicap/shared/android-M/x86_64/minicap.so deleted file mode 100755 index 967e4f40..00000000 Binary files a/vendor/minicap/shared/android-M/x86_64/minicap.so and /dev/null differ