diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-02 22:54:30 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-02 22:54:30 -0800 |
| commit | ee2298a313b6e425d6ff0324be6a313b1cd9a399 (patch) | |
| tree | e23c2549bfe9c14afbabe8cc2afa1da5218b540b /android/cmdline-options.h | |
| parent | d944e7a273e10cb40d795bdc25503b97ee60ae66 (diff) | |
| download | external_qemu-ee2298a313b6e425d6ff0324be6a313b1cd9a399.zip external_qemu-ee2298a313b6e425d6ff0324be6a313b1cd9a399.tar.gz external_qemu-ee2298a313b6e425d6ff0324be6a313b1cd9a399.tar.bz2 | |
auto import from //depot/cupcake/@137055
Diffstat (limited to 'android/cmdline-options.h')
| -rw-r--r-- | android/cmdline-options.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/android/cmdline-options.h b/android/cmdline-options.h index c0d121e..e38b081 100644 --- a/android/cmdline-options.h +++ b/android/cmdline-options.h @@ -59,21 +59,25 @@ * */ -CFG_PARAM( system, "<dir>", "read system image from <dir>" ) +CFG_PARAM( sysdir, "<dir>", "search for system disk images in <dir>" ) +CFG_PARAM( system, "<file>", "read initial system image from <file>" ) CFG_PARAM( datadir, "<dir>", "write user data into <dir>" ) CFG_PARAM( kernel, "<file>", "use specific emulated kernel" ) CFG_PARAM( ramdisk, "<file>", "ramdisk image (default <system>/ramdisk.img" ) -CFG_PARAM( image, "<file>", "system image (default <system>/system.img" ) -CFG_PARAM( initdata, "<file>", "initial data image (default <system>/userdata.img" ) +CFG_PARAM( image, "<file>", "obsolete, use -system <file> instead" ) +CFG_PARAM( init_data, "<file>", "initial data image (default <system>/userdata.img" ) +CFG_PARAM( initdata, "<file>", "same as '-init-data <file>'" ) CFG_PARAM( data, "<file>", "data image (default <datadir>/userdata-qemu.img" ) CFG_PARAM( cache, "<file>", "cache partition image (default is temporary file)" ) -CFG_FLAG ( nocache, "disable the cache partition" ) +CFG_FLAG ( no_cache, "disable the cache partition" ) +CFG_FLAG ( nocache, "same as -no-cache" ) OPT_PARAM( sdcard, "<file>", "SD card image (default <system>/sdcard.img") OPT_FLAG ( wipe_data, "reset the use data image (copy it from initdata)" ) CFG_PARAM( avd, "<name>", "use a specific android virtual device" ) CFG_PARAM( skindir, "<dir>", "search skins in <dir> (default <system>/skins)" ) -CFG_PARAM( skin, "<file>", "select a given skin" ) -CFG_FLAG ( noskin, "don't use any emulator skin" ) +CFG_PARAM( skin, "<name>", "select a given skin" ) +CFG_FLAG ( no_skin, "don't use any emulator skin" ) +CFG_FLAG ( noskin, "same as -no-skin" ) CFG_PARAM( memory, "<size>", "physical RAM size in MBs" ) OPT_PARAM( netspeed, "<speed>", "maximum network download/upload speeds" ) @@ -83,10 +87,12 @@ OPT_FLAG ( netfast, "disable network shaping" ) OPT_PARAM( trace, "<name>", "enable code profiling (F9 to start)" ) OPT_FLAG ( show_kernel, "display kernel messages" ) OPT_FLAG ( shell, "enable root shell on current terminal" ) -OPT_FLAG ( nojni, "disable JNI checks in the Dalvik runtime" ) +OPT_FLAG ( no_jni, "disable JNI checks in the Dalvik runtime" ) +OPT_FLAG ( nojni, "same as -no-jni" ) OPT_PARAM( logcat, "<tags>", "enable logcat output with given tags" ) -OPT_FLAG ( noaudio, "disable audio support" ) +OPT_FLAG ( no_audio, "disable audio support" ) +OPT_FLAG ( noaudio, "same as -no-audio" ) OPT_PARAM( audio, "<backend>", "use specific audio backend" ) OPT_PARAM( audio_in, "<backend>", "use specific audio input backend" ) OPT_PARAM( audio_out,"<backend>", "use specific audio output backend" ) |