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 /Makefile.android | |
| 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 'Makefile.android')
| -rw-r--r-- | Makefile.android | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.android b/Makefile.android index 1b44140..a6dd83a 100644 --- a/Makefile.android +++ b/Makefile.android @@ -1288,7 +1288,7 @@ VL_SOURCES := android/framebuffer.c \ android/looper-generic.c \ android/snapshot.c \ android/main-common.c \ - android/main-ui.c \ + android/main.c \ vl-android-ui.c \ iolooper-select.c \ android/protocol/core-connection.c \ |