cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject git commit: Fixing merge error.
Date Wed, 09 Jul 2014 17:53:55 GMT
Repository: cordova-amazon-fireos
Updated Branches:
  refs/heads/master 5fa8d6ef3 -> f0aaf8103


Fixing merge error.


Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/f0aaf810
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/f0aaf810
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/f0aaf810

Branch: refs/heads/master
Commit: f0aaf81031ac9369f5d29412ebb9a3c97c753634
Parents: 5fa8d6e
Author: Archana Naik <naika@lab126.com>
Authored: Wed Jul 9 10:33:53 2014 -0700
Committer: Archana Naik <naika@lab126.com>
Committed: Wed Jul 9 10:33:53 2014 -0700

----------------------------------------------------------------------
 bin/lib/check_reqs.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/f0aaf810/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 3525aa8..b15a9b6 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -79,12 +79,7 @@ module.exports.check_android = function() {
     return d.promise.then(function(output) {
         if (!output.match(valid_target)) {
             return Q.reject(new Error('Please install Android target ' + valid_target.split('-')[1]
+ ' (the Android newest SDK). Make sure you have the latest Android tools installed as well.
Run \"android\" from your command-line to install/update any missing SDKs or tools.'));
-        } else {
-            var awv_interface_expected_path=path.join(ROOT, 'framework','libs');
-            if (!fs.existsSync(path.join(awv_interface_expected_path,awv_interface))) {
-                return Q.reject(new Error('awv_interface.jar not found in ' + awv_interface_expected_path
+' folder. \nPlease download the AmazonWebView SDK from http://developer.amazon.com/sdk/fire/IntegratingAWV.html#installawv
and copy the awv_interface.jar file to this folder:' + awv_interface_expected_path + ' and
re-run cordova platform add amazon-fireos command.'));
-                }
-        }
+        } 
         return Q();
     }, function(stderr) {
         if (stderr.match(/command\snot\sfound/)) {


Mime
View raw message