commit f79b3338821dbabf2b0d31d42cd419e9e89a9068
author Jakob Andersen <jakobr@google.com> Wed Mar 22 13:51:28 2017 +0100
committer GitHub <noreply@github.com> Wed Mar 22 13:51:28 2017 +0100
tree fe6f8e7822755c62aea08702a4814a228ddf9371
parent 972da5432015d7e30c167084dd95a0fbcc52fb4a

Remove unnecessary Android SDK checks. (#8926)

* Remove unnecessary Android SDK checks.

* Remove unused accessors, skip replay test.

packages/flutter_tools/lib/src/android/android_sdk.dart

diff --git a/packages/flutter_tools/lib/src/android/android_sdk.dart b/packages/flutter_tools/lib/src/android/android_sdk.dart
index be3059d..4f23574 100644
--- a/packages/flutter_tools/lib/src/android/android_sdk.dart
+++ b/packages/flutter_tools/lib/src/android/android_sdk.dart
@@ -124,14 +124,14 @@
 
   /// Validate the Android SDK. This returns an empty list if there are no
   /// issues; otherwise, it returns a list of issues found.
-  List<String> validateSdkWellFormed({bool requireApkSigner = true}) {
+  List<String> validateSdkWellFormed() {
     if (!processManager.canRun(adbPath))
       return <String>['Android SDK file not found: $adbPath.'];
 
     if (sdkVersions.isEmpty || latestVersion == null)
       return <String>['Android SDK is missing command line tools; download from https://goo.gl/XxQghQ'];
 
-    return latestVersion.validateSdkWellFormed(requireApkSigner: requireApkSigner);
+    return latestVersion.validateSdkWellFormed();
   }
 
   String getPlatformToolsPath(String binaryName) {
@@ -227,32 +227,13 @@
 
   String get aaptPath => getBuildToolsPath('aapt');
 
-  String get dxPath => getBuildToolsPath('dx');
-
-  String get zipalignPath => getBuildToolsPath('zipalign');
-
-  String get apksignerPath => getBuildToolsPath('apksigner');
-
-  List<String> validateSdkWellFormed({bool requireApkSigner = true}) {
-    if (buildToolsVersion.major < minimumAndroidSdkVersion) {
-      return <String>['Minimum supported Android SDK version is $minimumAndroidSdkVersion '
-                      'but this system has ${buildToolsVersion.major}. Please upgrade.'];
-    }
+  List<String> validateSdkWellFormed() {
     if (_exists(androidJarPath) != null)
       return <String>[_exists(androidJarPath)];
 
     if (_canRun(aaptPath) != null)
       return <String>[_canRun(aaptPath)];
 
-    if (_canRun(dxPath) != null)
-      return <String>[_canRun(dxPath)];
-
-    if (_canRun(zipalignPath) != null)
-      return <String>[_canRun(zipalignPath)];
-
-    if (requireApkSigner && _canRun(apksignerPath) != null)
-      return <String>[_canRun(apksignerPath) + '\napksigner requires Android SDK Build Tools 24.0.3 or newer.'];
-
     return <String>[];
   }