cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject [01/12] cordova-amazon-fireos git commit: CB-8176 Update Android SDK search path for Android Studio 1.0
Date Fri, 16 Jan 2015 21:32:45 GMT
Repository: cordova-amazon-fireos
Updated Branches:
  refs/heads/master 24d21700d -> 1bbac72c8


CB-8176 Update Android SDK search path for Android Studio 1.0


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/11b2b1f4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/11b2b1f4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/11b2b1f4

Branch: refs/heads/master
Commit: 11b2b1f43febe74f6955576c2ddb9fea12ba90fe
Parents: 24d2170
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Dec 16 14:17:55 2014 -0500
Committer: Ajitha <ajithas@amazon.com>
Committed: Mon Jan 5 05:45:16 2015 +0000

----------------------------------------------------------------------
 bin/lib/check_reqs.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/11b2b1f4/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 8382de4..23c2b78 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -156,20 +156,26 @@ module.exports.check_android = function() {
         }
         if (!hasAndroidHome && !androidCmdPath) {
             if (isWindows) {
-                // Android Studio installer.
+                // Android Studio 1.0 installer
+                maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'sdk'));
+                maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'sdk'));
+                // Android Studio pre-1.0 installer
                 maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'android-studio',
'sdk'));
                 maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'android-studio',
'sdk'));
-                // Stand-alone installer.
+                // Stand-alone installer
                 maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'android-sdk'));
                 maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'android-sdk'));
             } else if (process.platform == 'darwin') {
+                // Android Studio 1.0 installer
+                maybeSetAndroidHome(path.join(process.env['HOME'], 'Library', 'Android',
'sdk'));
+                // Android Studio pre-1.0 installer
                 maybeSetAndroidHome('/Applications/Android Studio.app/sdk');
                 // Stand-alone zip file that user might think to put under /Applications
                 maybeSetAndroidHome('/Applications/android-sdk-macosx');
                 maybeSetAndroidHome('/Applications/android-sdk');
             }
             if (process.env['HOME']) {
-                // or their HOME directory.
+                // Stand-alone zip file that user might think to put under their home directory
                 maybeSetAndroidHome(path.join(process.env['HOME'], 'android-sdk-macosx'));
                 maybeSetAndroidHome(path.join(process.env['HOME'], 'android-sdk'));
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message