diff options
3 files changed, 5 insertions, 3 deletions
diff --git a/build/tools.windows.atree b/build/tools.windows.atree index 635e185..328f630 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -19,7 +19,9 @@ # rm tools/android -bin/win_android.exe strip tools/android.exe +sdk/sdkmanager/app/etc/android.bat tools/android.bat +#TODO enable later. Not ready for prime time yet. +#bin/win_android.exe strip tools/android.exe rm tools/apkbuilder sdk/apkbuilder/etc/apkbuilder.bat tools/apkbuilder.bat 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) {
|