diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-11-20 12:29:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-20 12:29:06 -0800 |
| commit | 018ce14ac3bbaa6d91a3c43668e03451ffd0e10d (patch) | |
| tree | aa6ea10ec940d736600f93817da4090a1f94e004 /android | |
| parent | c569bac075de9087621ce60ab72a429e696f27d8 (diff) | |
| parent | 5bc6182ae984796a6d14be7f7b8eb73c1b630b8e (diff) | |
| download | external_qemu-018ce14ac3bbaa6d91a3c43668e03451ffd0e10d.zip external_qemu-018ce14ac3bbaa6d91a3c43668e03451ffd0e10d.tar.gz external_qemu-018ce14ac3bbaa6d91a3c43668e03451ffd0e10d.tar.bz2 | |
am 5bc6182a: Fix location of prebuilt skins.
Merge commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e' into eclair-plus-aosp
* commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e':
Fix location of prebuilt skins.
Diffstat (limited to 'android')
| -rw-r--r-- | android/avd/info.c | 2 | ||||
| -rw-r--r-- | android/help.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/avd/info.c b/android/avd/info.c index 10e2005..e738065 100644 --- a/android/avd/info.c +++ b/android/avd/info.c @@ -1279,7 +1279,7 @@ _getBuildSkin( AvdInfo* i, AvdInfoParams* params ) if (!skinDir) { -#define PREBUILT_SKINS_DIR "development/emulator/skins" +#define PREBUILT_SKINS_DIR "sdk/emulator/skins" do { /* try in <sysdir>/../skins first */ diff --git a/android/help.c b/android/help.c index 50c9d02..a142f9d 100644 --- a/android/help.c +++ b/android/help.c @@ -116,7 +116,7 @@ help_build_images( stralloc_t* out ) " If the kernel image is not found in the out directory, then it is searched\n" " in <build-root>/prebuilt/android-arm/kernel/.\n\n" - " Skins will be looked in <build-root>/development/emulator/skins/\n\n" + " Skins will be looked in <build-root>/sdk/emulator/skins/\n\n" " You can use the -sysdir, -system, -kernel, -ramdisk, -datadir, -data options\n" " to specify different search directories or specific image files. You can\n" |