github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-9185 Fixed an issue when unsigned apks couldn't be found. This closes #202

Browse Source
This commit is contained in:
alsorokin 2015-07-22 18:39:35 +03:00 committed by Nikhil Khandelwal
parent d99a21eb8d
commit 8983ddbdcc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/templates/cordova/lib/build.js vendored
View File

@ -74,7 +74,7 @@ function findOutputApksHelper(dir, build_type, arch) {
return /-debug/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate); return /-debug/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate);
} }
if (build_type === 'release') { if (build_type === 'release') {
return /-release/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate); return /-release/.exec(candidate) && !/-unaligned/.exec(candidate);
} }
return true; return true;
}); });
@ -82,7 +82,7 @@ function findOutputApksHelper(dir, build_type, arch) {
if (ret.length === 0) { if (ret.length === 0) {
return ret; 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]); var archSpecific = !!/-x86|-arm/.exec(ret[0]);
// And show only arch-specific ones (or non-arch-specific) // And show only arch-specific ones (or non-arch-specific)
ret = ret.filter(function(p) { ret = ret.filter(function(p) {
@ -90,11 +90,12 @@ function findOutputApksHelper(dir, build_type, arch) {
return !!/-x86|-arm/.exec(p) == archSpecific; return !!/-x86|-arm/.exec(p) == archSpecific;
/*jshint +W018 */ /*jshint +W018 */
}); });
if (arch && ret.length > 1) { if (archSpecific && ret.length > 1) {
ret = ret.filter(function(p) { ret = ret.filter(function(p) {
return p.indexOf('-' + arch) != -1; return p.indexOf('-' + arch) != -1;
}); });
} }
return ret; return ret;
} }