diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-24 16:48:19 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-03-01 15:07:12 +0100 |
| commit | e5af8a259e619973538f393011b1c26a3e2f4afb (patch) | |
| tree | 8522658803d023b6d64e066a41092956ff0cb4bc /android/help.c | |
| parent | 092361e19ecc2992965729538984354099eea8cb (diff) | |
| download | external_qemu-e5af8a259e619973538f393011b1c26a3e2f4afb.zip external_qemu-e5af8a259e619973538f393011b1c26a3e2f4afb.tar.gz external_qemu-e5af8a259e619973538f393011b1c26a3e2f4afb.tar.bz2 | |
Remove CONFIG_ANDROID_SNAPSHOTS macro.
The feature is no longer optional.
Change-Id: I4558f12e3804e42069e8a3e6bcf0837d350206ed
Diffstat (limited to 'android/help.c')
| -rw-r--r-- | android/help.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/android/help.c b/android/help.c index 7df6704..e3a6643 100644 --- a/android/help.c +++ b/android/help.c @@ -166,9 +166,7 @@ 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" -#if CONFIG_ANDROID_SNAPSHOTS " snapshots.img an *optional* state snapshots image\n\n" -#endif " 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" @@ -184,11 +182,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" -#if CONFIG_ANDROID_SNAPSHOTS " -sdcard and -snapstorage.\n\n" -#else - " and -sdcard.\n\n" -#endif " The actual logic being that the emulator should be able to find all\n" " images from the options you give it.\n\n" @@ -205,10 +199,8 @@ help_disk_images( stralloc_t* out ) " -no-cache do not use a cache partition, even if one is\n" " available.\n\n" -#if CONFIG_ANDROID_SNAPSHOTS " -no-snapstorage do not use a state snapshot image, even if one is\n" " available.\n\n" -#endif , datadir ); } @@ -619,7 +611,6 @@ help_sdcard(stralloc_t* out) ); } -#if CONFIG_ANDROID_SNAPSHOTS static void help_snapstorage(stralloc_t* out) { @@ -733,8 +724,6 @@ help_snapshot_list(stralloc_t* out) ); } -#endif - static void help_skindir(stralloc_t* out) { |