cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nikhi...@apache.org
Subject android commit: CB-9185 Fixed an issue when unsigned apks couldn't be found. This closes #202
Date Wed, 22 Jul 2015 18:30:20 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master d99a21eb8 -> 8983ddbdc


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/8983ddbd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/8983ddbd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/8983ddbd

Branch: refs/heads/master
Commit: 8983ddbdccb60a680baa734e81b7817d1d4278a4
Parents: d99a21e
Author: alsorokin <alexander.sorokin@akvelon.com>
Authored: Wed Jul 22 18:39:35 2015 +0300
Committer: Nikhil Khandelwal <nikhilkh@microsoft.com>
Committed: Wed Jul 22 11:00:07 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/8983ddbd/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


Mime
View raw message