commit 1c31e3e43ce4cca85a707dfff631e5e102fdeced
author David 'Digit' Turner <digit@android.com> Sat Dec 14 20:07:17 2013 +0100
committer David 'Digit' Turner <digit@android.com> Wed Jan 08 07:32:41 2014 +0100
tree 6ff351a8cf9f8ac845cd035eac291a27b5fb9b55
parent e90d665cd63a0bc5c3306e1ee3e98ad362546b16

Even more moves.

  include/ui + ui/
  include/qapi/qmp/ + qobject/

Change-Id: Ief236a08cb234d9dd692e85907757678ef32f035

android/display-core.h

diff --git a/android/display-core.h b/android/display-core.h
index e6a1b7d..4a2b129 100644
--- a/android/display-core.h
+++ b/android/display-core.h
@@ -18,7 +18,7 @@
 #ifndef _ANDROID_DISPLAY_CORE_H
 #define _ANDROID_DISPLAY_CORE_H
 
-#include "console.h"
+#include "ui/console.h"
 
 /*
  * Initializes one and only one instance of a core display.

android/display.h

diff --git a/android/display.h b/android/display.h
index 4b9e908..75b471c 100644
--- a/android/display.h
+++ b/android/display.h
@@ -12,7 +12,7 @@
 #ifndef _ANDROID_DISPLAY_H
 #define _ANDROID_DISPLAY_H
 
-#include "console.h"
+#include "ui/console.h"
 #include "android/framebuffer.h"
 
 extern void android_display_init(DisplayState* ds, QFrameBuffer* qfbuff);

android/main-common.c

diff --git a/android/main-common.c b/android/main-common.c
index b724e4b..7db5976 100644
--- a/android/main-common.c
+++ b/android/main-common.c
@@ -22,7 +22,7 @@
 #include <SDL.h>
 #include <SDL_syswm.h>
 
-#include "console.h"
+#include "ui/console.h"
 
 #include "android/avd/util.h"
 #include "android/utils/debug.h"

android/main.c

diff --git a/android/main.c b/android/main.c
index 332183a..1ca94df 100644
--- a/android/main.c
+++ b/android/main.c
@@ -23,7 +23,7 @@
 #include "android/android.h"
 #include "qemu-common.h"
 #include "sysemu.h"
-#include "console.h"
+#include "ui/console.h"
 #include "user-events.h"
 
 #include <SDL.h>

android/protocol/core-commands-proxy.c

diff --git a/android/protocol/core-commands-proxy.c b/android/protocol/core-commands-proxy.c
index 0a50794..3449952 100644
--- a/android/protocol/core-commands-proxy.c
+++ b/android/protocol/core-commands-proxy.c
@@ -15,7 +15,7 @@
  * part of the UI control protocol. Here we send UI control commands to the Core.
  */
 
-#include "console.h"
+#include "ui/console.h"
 #include "android/looper.h"
 #include "android/async-utils.h"
 #include "android/sync-utils.h"

android/protocol/fb-updates-proxy.c

diff --git a/android/protocol/fb-updates-proxy.c b/android/protocol/fb-updates-proxy.c
index c1b431e..10d1e71 100644
--- a/android/protocol/fb-updates-proxy.c
+++ b/android/protocol/fb-updates-proxy.c
@@ -15,7 +15,7 @@
  * to the UI connected to the core.
  */
 
-#include "console.h"
+#include "ui/console.h"
 #include "android/looper.h"
 #include "android/display-core.h"
 #include "android/async-utils.h"

android/protocol/user-events-proxy.c

diff --git a/android/protocol/user-events-proxy.c b/android/protocol/user-events-proxy.c
index 3796ff9..16bd9f4 100644
--- a/android/protocol/user-events-proxy.c
+++ b/android/protocol/user-events-proxy.c
@@ -11,7 +11,7 @@
 */
 
 #include "user-events.h"
-#include "console.h"
+#include "ui/console.h"
 #include "android/looper.h"
 #include "android/async-utils.h"
 #include "android/utils/debug.h"