diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-02 09:38:54 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-02-02 09:38:54 -0800 |
| commit | 767911b2e4e34eee832fe9f9b4da0d2d281263f1 (patch) | |
| tree | de4e4222afa69f0e10762035f94ff0dd682dd457 /Makefile.android | |
| parent | 6d37ae98b765dc741caef137b7494133bb6f8980 (diff) | |
| parent | f845627c83ce6ce3e306f9b6842d1e30ef89ae97 (diff) | |
| download | external_qemu-767911b2e4e34eee832fe9f9b4da0d2d281263f1.zip external_qemu-767911b2e4e34eee832fe9f9b4da0d2d281263f1.tar.gz external_qemu-767911b2e4e34eee832fe9f9b4da0d2d281263f1.tar.bz2 | |
Merge "Move common main routines from into android-common.[hc]"
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.android b/Makefile.android index 811b58a..5faab57 100644 --- a/Makefile.android +++ b/Makefile.android @@ -879,6 +879,7 @@ VL_SOURCES := framebuffer.c \ android/looper-qemu.c \ android/protocol/ui-commands-qemu.c \ android/protocol/core-commands-qemu.c \ + android/main-common.c \ android/main.c \ # Add common system libraries @@ -1212,6 +1213,7 @@ VL_SOURCES := framebuffer.c \ android/looper-generic.c \ android/snapshot.c \ android/core-connection.c \ + android/main-common.c \ android/main-ui.c \ qemu-timer-ui.c \ vl-android-ui.c \ |