Make non-global constants have consistent naming (with just _ instead of _k) (#17584)
Our style guide says the k's are not necessary, and it seems like a good idea to make all the code be consistent on this.
Only naming changes to private vars: no logic changes.
diff --git a/packages/flutter_tools/lib/src/android/android_sdk.dart b/packages/flutter_tools/lib/src/android/android_sdk.dart
index cb8399c..79a5d67 100644
--- a/packages/flutter_tools/lib/src/android/android_sdk.dart
+++ b/packages/flutter_tools/lib/src/android/android_sdk.dart
@@ -223,8 +223,8 @@
_init();
}
- static const String _kJavaHomeEnvironmentVariable = 'JAVA_HOME';
- static const String _kJavaExecutable = 'java';
+ static const String _javaHomeEnvironmentVariable = 'JAVA_HOME';
+ static const String _javaExecutable = 'java';
/// The path to the Android SDK.
final String directory;
@@ -429,7 +429,7 @@
if (android_studio.javaPath != null)
return fs.path.join(android_studio.javaPath, 'bin', 'java');
- final String javaHomeEnv = platform.environment[_kJavaHomeEnvironmentVariable];
+ final String javaHomeEnv = platform.environment[_javaHomeEnvironmentVariable];
if (javaHomeEnv != null) {
// Trust JAVA_HOME.
return fs.path.join(javaHomeEnv, 'bin', 'java');
@@ -451,7 +451,7 @@
}
// Fallback to PATH based lookup.
- return os.which(_kJavaExecutable)?.path;
+ return os.which(_javaExecutable)?.path;
}
Map<String, String> _sdkManagerEnv;
