commit 6604aec53c51aa8f37346ebfff99231091f166f9
author Andrew Grieve <agrieve@chromium.org> Wed Sep 10 10:14:38 2014 -0400
committer Prabhjot Singh <prabhjos@amazon.com> Wed Sep 17 14:04:29 2014 +0530
tree 1bcc03dcffb534c36394cbbabdc3286831aea292
parent 8a6cdcc4bd81d1fc8c2bdb91df84966e94136836

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

bin/lib/check_reqs.js

diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 201d9a9..6d1dee3 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -141,6 +141,20 @@
         var androidCmdPath = forgivingWhichSync('android');
         var adbInPath = !!forgivingWhichSync('adb');
         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) {
             process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'tools');
         }
@@ -171,7 +185,8 @@
     .then(function(output) {
         if (!output.match(valid_target)) {
             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'));
         }
     });
 };