Cherry-pick crosswalk fix for cordova-android@6.4.0.

Ben Newman · Ben Newman · commit 322cbe8593bb · 2018-01-15T14:53:22.000-05:00
meteor#9274 (comment) cc @menelike
diff --git a/History.md b/History.md
@@ -51,6 +51,21 @@
   ```
   [PR #9343](https://github.com/meteor/meteor/pull/9343)
 
+* The [`cordova-lib`](https://github.com/apache/cordova-cli) package has
+  been updated to version 7.1.0,
+  [`cordova-android`](https://github.com/apache/cordova-android/) has been
+  updated to version 6.4.0 (plus one additional
+  [commit](https://github.com/meteor/cordova-android/commit/317db7df0f7a054444197bc6d28453cf4ab23280)),
+  and [`cordova-ios`](https://github.com/apache/cordova-ios/) has been
+  updated to version 4.5.4. The cordova plugins `cordova-plugin-console`,
+  `cordova-plugin-device-motion`, and `cordova-plugin-device-orientation`
+  have been [deprecated](https://cordova.apache.org/news/2017/09/22/plugins-release.html)
+  and will likely be removed in a future Meteor release.
+  [Feature Request #196](https://github.com/meteor/meteor-feature-requests/issues/196)
+  [PR #9213](https://github.com/meteor/meteor/pull/9213)
+  [Issue #9447](https://github.com/meteor/meteor/issues/9447)
+  [PR #9448](https://github.com/meteor/meteor/pull/9448)
+
 * The previously-served `/manifest.json` application metadata file is now
   served from `/__browser/manifest.json` for web browsers, to avoid
   confusion with other kinds of `manifest.json` files. Cordova clients
@@ -224,18 +239,6 @@
   [Issue #6912](https://github.com/meteor/meteor/issues/6912)
   [PR #9515](https://github.com/meteor/meteor/pull/9515)
 
-* [`cordova-lib`](https://github.com/apache/cordova-cli) has been updated to
-  version 7.1.0, [`cordova-android`](https://github.com/apache/cordova-android/)
-  has been updated to version 6.3.0, and [`cordova-ios`](https://github.com/apache/cordova-ios/)
-  has been updated to version 4.5.4. The cordova-plugins `cordova-plugin-console`,
-  `cordova-plugin-device-motion`, and `cordova-plugin-device-orientation` have been
-  [deprecated](https://cordova.apache.org/news/2017/09/22/plugins-release.html)
-  and will likely be removed in a future Meteor release.
-  [Feature Request #196](https://github.com/meteor/meteor-feature-requests/issues/196)
-  [PR #9213](https://github.com/meteor/meteor/pull/9213)
-  [Issue #9447](https://github.com/meteor/meteor/issues/9447)
-  [PR #9448](https://github.com/meteor/meteor/pull/9448)
-
 * Provide basic support for [iPhone X](https://developer.apple.com/ios/update-apps-for-iphone-x/)
   status bar and launch screens, which includes updates to
   [`cordova-plugin-statusbar@2.3.0`](https://github.com/apache/cordova-plugin-statusbar/blob/master/RELEASENOTES.md#230-nov-06-2017)
diff --git a/tools/cordova/index.js b/tools/cordova/index.js
@@ -14,7 +14,10 @@ export const CORDOVA_DEV_BUNDLE_VERSIONS = {
 };
 
 export const CORDOVA_PLATFORM_VERSIONS = {
-  'android': '6.4.0',
+  // This commit represents cordova-android@6.4.0 plus
+  // https://github.com/apache/cordova-android/pull/417, aka
+  // https://github.com/meteor/cordova-android/tree/v6.4.0-with-pr-417:
+  'android': 'https://github.com/meteor/cordova-android/tarball/317db7df0f7a054444197bc6d28453cf4ab23280',
   'ios': '4.5.4'
 };
 
diff --git a/tools/cordova/project.js b/tools/cordova/project.js
@@ -109,6 +109,12 @@ export class CordovaProject {
           return true;
         }
 
+        if (! semver.valid(pinnedVersion)) {
+          // If pinnedVersion is not a semantic version but instead
+          // something like a GitHub tarball URL, assume not outdated.
+          return false;
+        }
+
         return semver.lt(installedVersion, pinnedVersion);
       });
 
