aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-01-13 11:24:07 -0800
committerVladimir Chtchetkine <vchtchetkine@google.com>2011-01-13 11:24:07 -0800
commit90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447 (patch)
tree18ca241d0b2b91acbc5b9a0ee1c8b7c79ace2988 /Makefile.android
parent3bf6efc0928555529c3df28d291117390b840c16 (diff)
downloadexternal_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.zip
external_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.tar.gz
external_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.tar.bz2
Refining main-ui.c to better separate UI and core related initialization
The main reason for this is to clarify initialization for UI that starts core, and UI that attaches to an existing core. In this CL I did: - Removed -initdata option that seems obsolete (doesn't affect anything in the code) - Passed through -timezone option that doesn't affect anything in the UI, and is needed only in the core. - Removed dependency on AVD info from the core (core needed only virtual device name) Change-Id: Ie631249848a1b5b8d837c0c7b201a40ee7e4a367
Diffstat (limited to 'Makefile.android')
-rw-r--r--Makefile.android4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.android b/Makefile.android
index 8bd9b65..b502344 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -702,6 +702,7 @@ CORE_MISC_SOURCES = vl-android.c \
android/core-init-utils.c \
android/config.c \
android/snapshot.c \
+ android/utils/timezone.c \
ifeq ($(HOST_ARCH),x86)
CORE_MISC_SOURCES += i386-dis.c
@@ -757,6 +758,7 @@ UI_SOURCES = loadpng.c \
android/qemulator.c \
android/keycode.c \
android/help.c \
+ android/avd/info.c \
##############################################################################
# lists of source files used by both, emulator UI and emulator core
@@ -783,10 +785,8 @@ UI_AND_CORE_SOURCES = \
android/utils/stralloc.c \
android/utils/system.c \
android/utils/tempfile.c \
- android/utils/timezone.c \
android/utils/vector.c \
android/avd/hw-config.c \
- android/avd/info.c \
android/utils/ini.c \
# include the Zlib sources