From 342bbaa3ae735a01f3ca57169c98206844380c0a Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Tue, 16 Dec 2014 14:17:55 -0500 Subject: [PATCH] CB-8176 Update Android SDK search path for Android Studio 1.0 --- bin/lib/check_reqs.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js index 0b87bab2..6c2ec16c 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')); }