You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/12/16 20:18:46 UTC
android commit: CB-8176 Update Android SDK search path for Android
Studio 1.0
Repository: cordova-android
Updated Branches:
refs/heads/master 56a3ee5fe -> 342bbaa3a
CB-8176 Update Android SDK search path for Android Studio 1.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/342bbaa3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/342bbaa3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/342bbaa3
Branch: refs/heads/master
Commit: 342bbaa3ae735a01f3ca57169c98206844380c0a
Parents: 56a3ee5
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Dec 16 14:17:55 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Dec 16 14:17:55 2014 -0500
----------------------------------------------------------------------
bin/lib/check_reqs.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/342bbaa3/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 0b87bab..6c2ec16 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