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
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 @@
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;
}
}
}