From: Raphael Moll <ralf@android.com>
Date: Mon, 11 Apr 2011 19:31:01 +0000 (-0700)
Subject: SDK Manager: Fix detection of emulator in tools local folder.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4fb15245af9152a6390d5ceae848cd306f92b3df;p=android-x86%2Fsdk.git

SDK Manager: Fix detection of emulator in tools local folder.

That's because the constant used did not have
the extension anymore.

Note: this was only an issue on Windows since mac/linux
don't need the .exe extension in emulator.

Also this doesn't fix the missing "emulator.exe" in AOSP,
but digit has the CL for that. So in AOSP one need to manually
copy tools/emulator-arm to tools/emulator for the local tools
package to be correctly recognized.

Change-Id: I9ab254eec5c28c4d006ba4132d6b0c6d87c01e15
---

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 eb00562f3..c4b92b524 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
@@ -303,8 +303,12 @@ public class LocalSdkParser {
                 names.add(file.getName());
             }
         }
+
+        final String emulatorBinName =
+            SdkConstants.FN_EMULATOR + SdkConstants.FN_EMULATOR_EXTENSION;
+
         if (!names.contains(SdkConstants.androidCmdName()) ||
-                !names.contains(SdkConstants.FN_EMULATOR)) {
+                !names.contains(emulatorBinName)) {
             return null;
         }