diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-07-14 10:04:01 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-07-14 10:04:01 -0700 |
| commit | 7258f6b1539906849d02fa9f5e75360b0d01f48c (patch) | |
| tree | af1fe4d8becaed50e39c33bb1ec8600803eec289 /Makefile.android | |
| parent | a678138e7412d90ee8240dd80354295e2245c1ad (diff) | |
| download | external_qemu-7258f6b1539906849d02fa9f5e75360b0d01f48c.zip external_qemu-7258f6b1539906849d02fa9f5e75360b0d01f48c.tar.gz external_qemu-7258f6b1539906849d02fa9f5e75360b0d01f48c.tar.bz2 | |
Finished shuffling files.
Change-Id: Ifb0a1458fa9aa5c5143e876242e03e1eee2044b9
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 73 |
1 files changed, 41 insertions, 32 deletions
diff --git a/Makefile.android b/Makefile.android index 74d6fc6..dfbfdd3 100644 --- a/Makefile.android +++ b/Makefile.android @@ -609,12 +609,34 @@ CORE_MISC_SOURCES = console.c \ qemu-char-android.c \ disas.c \ arm-dis.c \ + aes.c \ + d3des.c \ + vnc-android.c \ + acl.c \ + buffered_file.c \ + cbuffer.c \ + gdbstub.c \ + ioport.c \ + shaper.c \ + charpipe.c \ + tcpdump.c \ + qemu-malloc.c \ + qemu-option.c \ + savevm.c \ + net-android.c \ + aio-android.c \ + dma-helpers.c \ + qemu-sockets-android.c \ + bt-host.c \ + bt-vhci.c \ + module.c \ android/boot-properties.c \ android/hw-kmsg.c \ android/hw-lcd.c \ android/gps.c \ android/hw-events.c \ android/hw-control.c \ + android/console.c \ android/avd/hw-config.c \ android/avd/info.c \ android/utils/ini.c \ @@ -640,8 +662,24 @@ ifeq ($(HOST_OS),windows) CORE_MISC_SOURCES += tap-win32.c endif +# sources inherited from upstream, but not fully +# integrated into android emulator +# +CORE_UPSTREAM_SOURCES = json-lexer.c \ + json-parser.c \ + json-streamer.c \ + qjson.c \ + qbool.c \ + qdict.c \ + qfloat.c \ + qint.c \ + qlist.c \ + qstring.c \ + + CORE_SOURCES = $(CORE_BLOCK_SOURCES) $(CORE_HW_SOURCES) CORE_SOURCES += $(CORE_MIGRATION_SOURCES) $(CORE_MISC_SOURCES) +CORE_SOURCES += $(CORE_UPSTREAM_SOURCES) # temp file used to collect UI->Core exchange protocol. CORE_SOURCES += android/ui-core-protocol.c @@ -649,7 +687,9 @@ CORE_SOURCES += android/ui-core-protocol.c # lists of source files used to build the emulator UI # -UI_SOURCES = android/user-config.c \ +UI_SOURCES = loadpng.c \ + keymaps.c \ + android/user-config.c \ android/resource.c \ android/qemulator.c \ android/keycode.c \ @@ -746,41 +786,10 @@ endif # include other sources # VL_SOURCES := vl-android.c \ - aes.c d3des.c \ - buffered_file.c \ - cbuffer.c \ - gdbstub.c \ - ioport.c \ - vnc-android.c \ - shaper.c charpipe.c loadpng.c \ framebuffer.c \ - tcpdump.c \ - qemu-malloc.c \ - qemu-option.c \ - savevm.c \ - net-android.c \ - acl.c \ - aio-android.c \ - dma-helpers.c \ - qemu-sockets-android.c \ - keymaps.c \ - bt-host.c \ - bt-vhci.c \ - module.c \ - json-lexer.c \ - json-parser.c \ - json-streamer.c \ - qbool.c \ - qdict.c \ - qfloat.c \ - qint.c \ - qjson.c \ - qlist.c \ - qstring.c \ user-events-qemu.c \ android/cmdline-option.c \ android/config.c \ - android/console.c \ android/hw-sensors.c \ android/main.c \ |