Repository: cordova-android
Updated Branches:
  refs/heads/master d3245a43d -> 6b071c0fb


CB-9286 Fixes build failure when ANDROID_HOME is not set.


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6b071c0f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6b071c0f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6b071c0f

Branch: refs/heads/master
Commit: 6b071c0fb2c4c2a5622b6e5d87c09a0bf9e784d6
Parents: d3245a4
Author: Vladimir Kotikov <[email protected]>
Authored: Fri Jul 3 09:46:39 2015 +0300
Committer: Vladimir Kotikov <[email protected]>
Committed: Fri Jul 3 09:46:39 2015 +0300

----------------------------------------------------------------------
 bin/lib/check_reqs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b071c0f/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 5ddf4b4..d11a0d2 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -260,7 +260,7 @@ module.exports.check_android_target = 
function(valid_target) {
 
 // Returns a promise.
 module.exports.run = function() {
-    return Q.all([this.check_java(), this.check_android(), 
this.check_android_target()])
+    return Q.all([this.check_java(), 
this.check_android().then(this.check_android_target)])
     .then(function() {
         console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']);
         console.log('JAVA_HOME=' + process.env['JAVA_HOME']);


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to