aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-02-23 10:10:49 -0800
committerAndroid Code Review <code-review@android.com>2011-02-23 10:10:49 -0800
commit02f10347d2244c192de8da96a6d6a6a66c394721 (patch)
tree327f76a87735a2276ad2e0ac3572796f6c677aa6 /Makefile.android
parent6628e3728761782488eabf635faf7899d2f671cc (diff)
parentbdb6f2dd35a4c749186e665d55d7b76375d7e71d (diff)
downloadexternal_qemu-02f10347d2244c192de8da96a6d6a6a66c394721.zip
external_qemu-02f10347d2244c192de8da96a6d6a6a66c394721.tar.gz
external_qemu-02f10347d2244c192de8da96a6d6a6a66c394721.tar.bz2
Merge "Remove android/main-ui.c"
Diffstat (limited to 'Makefile.android')
-rw-r--r--Makefile.android2
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 \