Merge branch 'android-7.1'

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.1.0 (2016-10-24)
+
+Minor release addressing the following:
+
+### Enhancements
+
+- Android 7.1 support!
+
+### Fixes
+
+- [STFService.apk](https://github.com/openstf/STFService.apk) now uses abstract sockets instead of TCP sockets. This fixes stability issues with devices connected in RNDIS mode.
+- Updated [adbkit](https://github.com/openstf/adbkit) to fix `logcat` issues on newer Android versions.
+- General reliability improvements in [adbkit](https://github.com/openstf/adbkit).
+- Fixed [minitouch](https://github.com/openstf/minitouch) on Alcatel Idol 3.
+
 ## 2.0.1 (2016-07-29)
 
 No changes, just a retag due to issues with NPM tags.

README.md

@@ -28,17 +28,11 @@ HeadSpin offers a generous monthly contribution towards STF development.
 
 Please [contact us][contact-link] for sponsor arrangements. Both recurring and one-time contributions are most welcome. Contributions towards a specific issue or feature are also possible, and can be attributed to your company in our release notes and other related materials. Hardware-only contributions, whether new or used, are also extremely helpful and well received, especially if you find a device that doesn't work. Please see our [donation transparency report](DONATION-TRANSPARENCY.md) for past hardware contributions.
 
-## Announcements
-
-* Thanks to @qband, @juliusspencer and Anonymous donors, we've been able to confirm [Android N Preview 5 support!](https://github.com/openstf/stf/issues/279)
-* We've added a [donation transparency report](DONATION-TRANSPARENCY.md) for all to see.
-* [HeadSpin](https://headspin.io/) is now sponsoring future development!
-
 ## Features
 
 * OS support
   - Android
-    * Supports versions 2.3.3 (SDK level 10) to Android N Preview 5
+    * Supports versions 2.3.3 (SDK level 10) to 7.1 (SDK level 25)
     * Supports Wear 5.1 (but not 5.0 due to missing permissions)
     * Supports Fire OS, CyanogenMod, and other heavily Android based distributions
     * `root` is **not** required for any current functionality

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(
+          return pathutil.module(util.format(
-            'minicap/bin/%s/minicap%s'
+            '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(
+            pathutil.module(util.format(
-              'minicap/shared/android-%s/%s/minicap.so'
+              'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
+            , supportedAbi
             , properties['ro.build.version.release']
-            , supportedAbi
             ))
-          , pathutil.vendor(util.format(
+          , pathutil.module(util.format(
-              'minicap/shared/android-%d/%s/minicap.so'
+              'minicap-prebuilt/prebuilt/%s/lib/android-%s/minicap.so'
-            , properties['ro.build.version.sdk']
             , supportedAbi
+            , properties['ro.build.version.sdk']
             ))
           ])
         }, []))

package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@slack/client": "^3.5.4",
-    "adbkit": "^2.6.0",
+    "adbkit": "^2.6.1",
     "adbkit-apkreader": "^1.0.0",
     "adbkit-monkey": "^1.0.1",
     "aws-sdk": "^2.4.13",
@@ -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",