From 1f12fdbeea36646604d667e4e2e221547b07ca8f Mon Sep 17 00:00:00 2001
From: filmaj <maj.fil@gmail.com>
Date: Thu, 5 Oct 2017 15:17:31 -0500
Subject: [PATCH] CB-13404: add android-versions to bundledDependencies. Ignore
best emulator selection when parsed AVD information does not include API
level in the target
---
bin/templates/cordova/lib/emulator.js | 6 +++---
package.json | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js
index 6828176b..edb7c800 100644
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -207,11 +207,11 @@ module.exports.best_image = function () {
var closest = 9999;
var best = images[0];
- var project_target = check_reqs.get_target().replace('android-', '');
+ var project_target = parseInt(check_reqs.get_target().replace('android-', ''));
for (var i in images) {
var target = images[i].target;
- if (target) {
- var num = target.split('(API level ')[1].replace(')', '');
+ if (target && target.indexOf('API level') > -1) {
+ var num = parseInt(target.split('(API level ')[1].replace(')', ''));
if (num === project_target) {
return images[i];
} else if (project_target - num < closest && project_target > num) {
diff --git a/package.json b/package.json
index f40983f3..88a0da7f 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"author": "Apache Software Foundation",
"license": "Apache-2.0",
"dependencies": {
- "android-versions": "^1.2.0",
+ "android-versions": "^1.2.1",
"cordova-common": "^2.1.0",
"elementtree": "0.1.6",
"nopt": "^3.0.1",
@@ -38,6 +38,7 @@
"shelljs": "^0.5.3"
},
"bundledDependencies": [
+ "android-versions",
"cordova-common",
"elementtree",
"nopt",