SDK: Switch back to android.bat.

android.exe is not ready for usage yet.
The local sdk parser can still detect both.

Change-Id: I597f9b5553628b55703aa12282b2808c0b6d1fb1

2 files changed, 2 insertions, 2 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
index 545da62..8f17886 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
@@ -419,7 +419,7 @@ public final class SdkConstants {
         String os = System.getProperty("os.name");          //$NON-NLS-1$
         String cmd = "android";                             //$NON-NLS-1$
         if (os.startsWith("Windows")) {                     //$NON-NLS-1$
-            cmd += ".exe";                                  //$NON-NLS-1$
+            cmd += ".bat";                                  //$NON-NLS-1$
         }
         return cmd;
     }
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java
index 18b8cc5..2e65388 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java
@@ -418,7 +418,7 @@ public class LocalSdkParser {
         // we should expect to find android and an emulator adapted to the current OS.

         boolean hasEmulator = false;

         boolean hasAndroid = false;

-        String android1 = SdkConstants.androidCmdName();

+        String android1 = SdkConstants.androidCmdName().replace(".bat", ".exe");

         String android2 = android1.indexOf('.') == -1 ? null : android1.replace(".exe", ".bat");

         File[] files = toolFolder.listFiles();

         if (files != null) {