Even more moves.
include/ui + ui/
include/qapi/qmp/ + qobject/
Change-Id: Ief236a08cb234d9dd692e85907757678ef32f035
diff --git a/Makefile.common b/Makefile.common
index 62f0cc1..dcfd53d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -419,25 +419,16 @@
buffered_file.c \
cbuffer.c \
charpipe.c \
- console.c \
- d3des.c \
input.c \
iohandler.c \
ioport.c \
net-android.c \
- path.c \
qemu-char.c \
- qemu-config.c \
- qemu-error.c \
qemu-malloc.c \
- qemu-option.c \
- qemu-sockets-android.c \
- qerror.c \
readline.c \
savevm.c \
shaper.c \
tcpdump.c \
- vnc-android.c \
android/boot-properties.c \
android/config.c \
android/core-init-utils.c \
@@ -465,12 +456,21 @@
android/multitouch-screen.c \
android/multitouch-port.c \
android/utils/jpeg-compress.c \
+ qobject/qerror.c \
+ ui/console.c \
+ ui/d3des.c \
+ ui/vnc-android.c \
util/acl.c \
util/aes.c \
util/cutils.c \
util/module.c \
util/notify.c \
util/osdep.c \
+ util/path.c \
+ util/qemu-config.c \
+ util/qemu-error.c \
+ util/qemu-option.c \
+ util/qemu-sockets-android.c \
ifeq ($(HOST_ARCH),x86)
CORE_MISC_SOURCES += i386-dis.c
@@ -485,7 +485,7 @@
ifeq ($(HOST_OS),linux)
CORE_MISC_SOURCES += usb-linux.c \
- qemu-thread.c \
+ util/qemu-thread.c \
android/camera/camera-capture-linux.c
else
CORE_MISC_SOURCES += usb-dummy-android.c
@@ -560,16 +560,16 @@
# integrated into android emulator
#
common_LOCAL_SRC_FILES += \
- json-lexer.c \
- json-parser.c \
- json-streamer.c \
- qjson.c \
- qbool.c \
- qdict.c \
- qfloat.c \
- qint.c \
- qlist.c \
- qstring.c \
+ qobject/json-lexer.c \
+ qobject/json-parser.c \
+ qobject/json-streamer.c \
+ qobject/qjson.c \
+ qobject/qbool.c \
+ qobject/qdict.c \
+ qobject/qfloat.c \
+ qobject/qint.c \
+ qobject/qlist.c \
+ qobject/qstring.c \
ifeq ($(QEMU_TARGET_XML_SOURCES),)
QEMU_TARGET_XML_SOURCES := arm-core arm-neon arm-vfp arm-vfp3