Commit dddf5727 authored by Ian Hickson's avatar Ian Hickson Committed by GitHub

Minor tweaks to flutter doctor (#9963)

parent 7a52116d
...@@ -104,7 +104,7 @@ class AndroidWorkflow extends DoctorValidator implements Workflow { ...@@ -104,7 +104,7 @@ class AndroidWorkflow extends DoctorValidator implements Workflow {
} else { } else {
messages.add(new ValidationMessage.error( messages.add(new ValidationMessage.error(
'Unable to locate Android SDK.\n' 'Unable to locate Android SDK.\n'
'Install Android Studio from https://developer.android.com/studio/index.html.\n' 'Install Android Studio from: https://developer.android.com/studio/index.html\n'
'On first launch it will assist you in installing the Android SDK components.\n' 'On first launch it will assist you in installing the Android SDK components.\n'
'(or visit https://flutter.io/setup/#android-setup for detailed instructions).\n' '(or visit https://flutter.io/setup/#android-setup for detailed instructions).\n'
'If Android SDK has been installed to a custom location, set \$$kAndroidHome to that location.' 'If Android SDK has been installed to a custom location, set \$$kAndroidHome to that location.'
......
...@@ -133,10 +133,9 @@ String ensureGradle() { ...@@ -133,10 +133,9 @@ String ensureGradle() {
String gradle = locateProjectGradlew(); String gradle = locateProjectGradlew();
if (gradle == null) { if (gradle == null) {
gradle = locateSystemGradle(); gradle = locateSystemGradle();
if (gradle == null) { if (gradle == null)
throwToolExit('Unable to locate gradle. Please install Android Studio.'); throwToolExit('Unable to locate gradle. Please install Android Studio.');
} }
}
printTrace('Using gradle from $gradle.'); printTrace('Using gradle from $gradle.');
return gradle; return gradle;
} }
......
...@@ -11,6 +11,7 @@ class DoctorCommand extends FlutterCommand { ...@@ -11,6 +11,7 @@ class DoctorCommand extends FlutterCommand {
DoctorCommand() { DoctorCommand() {
argParser.addFlag('android-licenses', argParser.addFlag('android-licenses',
defaultsTo: false, defaultsTo: false,
negatable: false,
help: 'Run the Android SDK manager tool to accept the SDK\'s licenses.', help: 'Run the Android SDK manager tool to accept the SDK\'s licenses.',
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment