commit 7db8241a6d5d28d98e3062e10378f4734da5a233
author Michael Goderbauer <goderbauer@google.com> Tue Feb 21 16:26:30 2017 -0800
committer GitHub <noreply@github.com> Tue Feb 21 16:26:30 2017 -0800
tree 5686cf8028377ec13ebd81067c18367d27e3b4f9
parent b6e282779a58e5c77365bdc83dac5d3d58c3cff9

Revert "Revert "Replace jarsigner with apksigner" (#8164)" (#8320)

This reverts commit 70d7fe3a0dede9f3556fda8fe018dc4ed4a08490.

The Java version missmatch on the bots has been resolved.

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 d590d65..7c00697 100644
--- a/packages/flutter_tools/lib/src/android/android_sdk.dart
+++ b/packages/flutter_tools/lib/src/android/android_sdk.dart
@@ -24,6 +24,7 @@
 // $ANDROID_HOME/build-tools/22.0.1/aapt
 // $ANDROID_HOME/build-tools/23.0.2/aapt
 // $ANDROID_HOME/build-tools/24.0.0-preview/aapt
+// $ANDROID_HOME/build-tools/25.0.2/apksigner
 
 // $ANDROID_HOME/platforms/android-22/android.jar
 // $ANDROID_HOME/platforms/android-23/android.jar
@@ -225,6 +226,8 @@
 
   String get zipalignPath => getBuildToolsPath('zipalign');
 
+  String get apksignerPath => getBuildToolsPath('apksigner');
+
   List<String> validateSdkWellFormed() {
     if (_exists(androidJarPath) != null)
       return <String>[_exists(androidJarPath)];
@@ -238,6 +241,9 @@
     if (_canRun(zipalignPath) != null)
       return <String>[_canRun(zipalignPath)];
 
+    if (_canRun(apksignerPath) != null)
+      return <String>[_canRun(apksignerPath) + '\napksigner requires Android SDK Build Tools 24.0.3 or newer.'];
+
     return <String>[];
   }