auto import from //branches/cupcake/...@130745

This commit is contained in:
The Android Open Source Project
2009-02-10 15:43:58 -08:00
parent 5a4d0fa291
commit e3c5766074
95 changed files with 6116 additions and 2460 deletions

View File

@@ -32,9 +32,9 @@ public final class AndroidLocation {
private static final String ANDROID_SDK_VERSION = "SDK-1.0";
/**
* VM folder inside the path returned by {@link #getFolder()}
* Virtual Device folder inside the path returned by {@link #getFolder()}
*/
public static final String FOLDER_VMS = "vm";
public static final String FOLDER_AVD = "avd";
/**
* Throw when the location of the android folder couldn't be found.
@@ -56,7 +56,7 @@ public final class AndroidLocation {
*/
public final static String getFolder() throws AndroidLocationException {
if (sPrefsLocation == null) {
String home = findValidPath("user.home", "HOME");
String home = findValidPath("ANDROID_SDK_HOME", "user.home", "HOME");
// if the above failed, we throw an exception.
if (home == null) {