From 8983ddbdccb60a680baa734e81b7817d1d4278a4 Mon Sep 17 00:00:00 2001 From: alsorokin Date: Wed, 22 Jul 2015 18:39:35 +0300 Subject: [PATCH] CB-9185 Fixed an issue when unsigned apks couldn't be found. This closes #202 --- bin/templates/cordova/lib/build.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index cd07a59f..aa9f3d01 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -74,7 +74,7 @@ function findOutputApksHelper(dir, build_type, arch) { return /-debug/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate); } if (build_type === 'release') { - return /-release/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate); + return /-release/.exec(candidate) && !/-unaligned/.exec(candidate); } return true; }); @@ -82,7 +82,7 @@ function findOutputApksHelper(dir, build_type, arch) { if (ret.length === 0) { return ret; } - // Assume arch-specific build if newest api has -x86 or -arm. + // Assume arch-specific build if newest apk has -x86 or -arm. var archSpecific = !!/-x86|-arm/.exec(ret[0]); // And show only arch-specific ones (or non-arch-specific) ret = ret.filter(function(p) { @@ -90,11 +90,12 @@ function findOutputApksHelper(dir, build_type, arch) { return !!/-x86|-arm/.exec(p) == archSpecific; /*jshint +W018 */ }); - if (arch && ret.length > 1) { + if (archSpecific && ret.length > 1) { ret = ret.filter(function(p) { return p.indexOf('-' + arch) != -1; }); } + return ret; }