diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-23 15:57:25 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-02-23 17:05:34 +0100 |
| commit | bdb6f2dd35a4c749186e665d55d7b76375d7e71d (patch) | |
| tree | 327f76a87735a2276ad2e0ac3572796f6c677aa6 /vl-android.c | |
| parent | dd90991bb911bc61c885f710a848692b593b72c3 (diff) | |
| download | external_qemu-bdb6f2dd35a4c749186e665d55d7b76375d7e71d.zip external_qemu-bdb6f2dd35a4c749186e665d55d7b76375d7e71d.tar.gz external_qemu-bdb6f2dd35a4c749186e665d55d7b76375d7e71d.tar.bz2 | |
Remove android/main-ui.c
The differences between android/main.c and android/main-ui.c are now
minimal, so remove the latter source file by moving the corresponding
code into android/main-common.c
Also add a -snapshot-no-time-update core option to implement the
emulator-ui -no-snapshot-update-time option. We're probably going to
clean this up a little in the future, but this is enough for now.
Change-Id: I868bb4e47c3d106ae7436ee3f5b2c0ff5fb6ea5c
Diffstat (limited to 'vl-android.c')
| -rw-r--r-- | vl-android.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vl-android.c b/vl-android.c index 1afc8d2..85971b9 100644 --- a/vl-android.c +++ b/vl-android.c @@ -58,6 +58,7 @@ #include "android/utils/bufprint.h" #include "android/display-core.h" #include "android/utils/timezone.h" +#include "android/snapshot.h" #include "targphys.h" #include "tcpdump.h" @@ -4800,6 +4801,10 @@ int main(int argc, char **argv, char **envp) append_param(kernel_cmdline_append, tmp_str, sizeof(kernel_cmdline_append)); break; #endif // CONFIG_MEMCHECK + + case QEMU_OPTION_snapshot_no_time_update: + android_snapshot_update_time = 0; + break; } } } |