github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-11 00:00:05 +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 
(cherry picked from commit 8983ddbdcc)
This commit is contained in:
alsorokin
2015-07-22 18:39:35 +03:00
committed by Nikhil Khandelwal
parent 5fb913d000
commit d40f43c144
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/cordova/lib/build.js
Vendored
+4 -3
View File
@@ -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;
}