github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2024-10-06 17:42:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-7511 Auto-detect Android SDK when Android Studio is installed

Browse Source
This commit is contained in:
Andrew Grieve 2014-09-10 10:14:38 -04:00
parent 8354651059
commit 8237c41143
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/lib/check_reqs.js
View File

@ -141,6 +141,20 @@ module.exports.check_android = function() {
var androidCmdPath = forgivingWhichSync('android'); var androidCmdPath = forgivingWhichSync('android');
var adbInPath = !!forgivingWhichSync('adb'); var adbInPath = !!forgivingWhichSync('adb');
var hasAndroidHome = !!process.env['ANDROID_HOME'] && fs.existsSync(process.env['ANDROID_HOME']); var hasAndroidHome = !!process.env['ANDROID_HOME'] && fs.existsSync(process.env['ANDROID_HOME']);
function maybeSetAndroidHome(value) {
if (fs.existsSync(value)) {
hasAndroidHome = true;
process.env['ANDROID_HOME'] = value;
}
}
if (!hasAndroidHome && !androidCmdPath) {
if (isWindows) {
maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'android-studio', 'sdk'));
maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'android-studio', 'sdk'));
} else if (process.platform == 'darwin') {
maybeSetAndroidHome('/Applications/Android Studio.app/sdk');
}
}
if (hasAndroidHome && !androidCmdPath) { if (hasAndroidHome && !androidCmdPath) {
process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'tools'); process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'tools');
} }
@ -171,7 +185,8 @@ module.exports.check_android_target = function(valid_target) {
.then(function(output) { .then(function(output) {
if (!output.match(valid_target)) { if (!output.match(valid_target)) {
throw new Error('Please install Android target "' + valid_target + '".\n' + throw new Error('Please install Android target "' + valid_target + '".\n' +
'Hint: Run "android" from your command-line to open the SDK manager.'); output + '\n\n' +
'Hint: Install it using the SDK manager by running: ' + forgivingWhichSync('android'));
} }
}); });
}; };