diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-04-15 15:04:16 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2010-04-15 15:04:16 -0700 |
| commit | 92568958dd42bf35667cc6451b5edd7f7d1f73a1 (patch) | |
| tree | 573e33581b6db6dfc9efc1ac34104887e994b015 /android/help.c | |
| parent | fbcab322c2a12bfe49d0faaef91fccdc7bb97d4e (diff) | |
| download | external_qemu-92568958dd42bf35667cc6451b5edd7f7d1f73a1.zip external_qemu-92568958dd42bf35667cc6451b5edd7f7d1f73a1.tar.gz external_qemu-92568958dd42bf35667cc6451b5edd7f7d1f73a1.tar.bz2 | |
Revert previous patch to fix SD Card emulation
The previous patch modifies SD Card hardware emulation in a way that is
not backwards compatible with previous SDK platform releases. This has
the unfortunate effect of making SD Card emulation not work properly
when running existing AVDs.
Reverting the patch until we get a better one.
Change-Id: I82dac87709d88aa3bd292bf2ed0008ae74d95853
Diffstat (limited to 'android/help.c')
| -rw-r--r-- | android/help.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/android/help.c b/android/help.c index fe724a6..e8737f5 100644 --- a/android/help.c +++ b/android/help.c @@ -120,8 +120,8 @@ help_build_images( stralloc_t* out ) " You can use the -sysdir, -system, -kernel, -ramdisk, -datadir, -data options\n" " to specify different search directories or specific image files. You can\n" - " also use the -cache, -sdcard, and -sdcard2 options to indicate specific \n" - " cache partition and SD Card image files.\n\n" + " also use the -cache and -sdcard options to indicate specific cache partition\n" + " and SD Card image files.\n\n" " For more details, see the corresponding -help-<option> section.\n\n" @@ -166,7 +166,6 @@ help_disk_images( stralloc_t* out ) " system-qemu.img an *optional* persistent system image\n" " cache.img an *optional* cache partition image\n" " sdcard.img an *optional* SD Card partition image\n\n" - " sdcard2.img an *optional* second SD Card partition image\n\n" " If you use a virtual device, its content directory should store\n" " all writable images, and read-only ones will be found from the\n" @@ -182,7 +181,7 @@ help_disk_images( stralloc_t* out ) " can still run the emulator by explicitely providing the paths to\n" " *all* required disk images through a combination of the following\n" " options: -sysdir, -datadir, -kernel, -ramdisk, -system, -data, -cache\n" - " -sdcard, and -sdcard2\n\n" + " and -sdcard\n\n" " The actual logic being that the emulator should be able to find all\n" " images from the options you give it.\n\n" @@ -622,21 +621,6 @@ help_sdcard(stralloc_t* out) } static void -help_sdcard2(stralloc_t* out) -{ - PRINTF( - " use '-sdcard2 <file>' to specify a second SD Card image file that will be attached\n" - " to the emulator. By default, the 'sdcard.img' file is searched in the data\n" - " directory.\n\n" - - " if the file does not exist, the emulator will still start, but without a\n" - " second SD Card attached.\n\n" - - " see '-help-disk-images' for more information about disk image files\n\n" - ); -} - -static void help_skindir(stralloc_t* out) { PRINTF( |