diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-07-07 15:57:00 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-07-07 16:49:12 -0700 |
| commit | 71bb14f826775867d16e7d382cfdc48e6ca46ccb (patch) | |
| tree | 9e533673a8c4f7e8bc4b2b1f83589196e0957c0f /Makefile.android | |
| parent | a21ac6912568a1d36a2919669f905bc58be21244 (diff) | |
| download | external_qemu-71bb14f826775867d16e7d382cfdc48e6ca46ccb.zip external_qemu-71bb14f826775867d16e7d382cfdc48e6ca46ccb.tar.gz external_qemu-71bb14f826775867d16e7d382cfdc48e6ca46ccb.tar.bz2 | |
Move key event generation out of the UI realm into neutral space.
Abstracted keycode event array into keycode_array.[hc],
Moved key to keycode translation into charmap.c
Change-Id: I4de0c9853fa93d675895fc361e62ee36c1c0a652
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.android b/Makefile.android index 3c0625c..016126a 100644 --- a/Makefile.android +++ b/Makefile.android @@ -630,7 +630,7 @@ endif CORE_SOURCES = $(CORE_BLOCK_SOURCES) $(CORE_HW_SOURCES) CORE_SOURCES += $(CORE_MIGRATION_SOURCES) $(CORE_MISC_SOURCES) # temp file used to collect UI->Core exchange protocol. -CORE_SOURCES += android/ui_core_protocol.c +CORE_SOURCES += android/ui-core-protocol.c ############################################################################## # lists of source files used to build the emulator UI @@ -638,11 +638,17 @@ CORE_SOURCES += android/ui_core_protocol.c UI_SOURCES = android/user-config.c \ android/resource.c \ - android/charmap.c \ android/qemulator.c \ android/keycode.c \ ############################################################################## +# lists of source files used by both, emulator UI and emulator core +# + +UI_AND_CORE_SOURCES = android/keycode-array.c \ + android/charmap.c \ + +############################################################################## # now build the emulator itself # include $(CLEAR_VARS) @@ -778,7 +784,7 @@ ifeq ($(HOST_OS),freebsd) LOCAL_LDLIBS += -L/usr/local/lib -lpthread -lX11 -lutil endif -LOCAL_SRC_FILES += $(VL_SOURCES) $(CORE_SOURCES) $(UI_SOURCES) +LOCAL_SRC_FILES += $(VL_SOURCES) $(CORE_SOURCES) $(UI_SOURCES) $(UI_AND_CORE_SOURCES) ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lutil -lrt |