You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2015/09/23 21:58:29 UTC
[18/45] android commit: CB-9185 Fixed an issue when unsigned apks
couldn't be found. This closes #202
CB-9185 Fixed an issue when unsigned apks couldn't be found. This closes #202
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/78a2951a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/78a2951a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/78a2951a
Branch: refs/heads/5.0.x
Commit: 78a2951a4fbf909099739d4bc4ae2cdcf6a1e6b1
Parents: e02cbc7
Author: alsorokin <al...@akvelon.com>
Authored: Wed Jul 22 18:39:35 2015 +0300
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Aug 20 13:48:03 2015 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/78a2951a/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index cd07a59..aa9f3d0 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org