aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-02-02 14:05:23 +0100
committerDavid 'Digit' Turner <digit@android.com>2011-02-02 14:05:23 +0100
commite993126c6704029cb1c656922a66a32bd09b6089 (patch)
tree64df4e534e0364cb3d45b4eef564e401932a118e /android
parent74d7acec6643694132a127feb5ccadda7ea793d6 (diff)
downloadexternal_qemu-e993126c6704029cb1c656922a66a32bd09b6089.zip
external_qemu-e993126c6704029cb1c656922a66a32bd09b6089.tar.gz
external_qemu-e993126c6704029cb1c656922a66a32bd09b6089.tar.bz2
Move core-connection.c from to android/protocol/
Change-Id: I1f04ed1f00fccdea043f4a4fbf5ba745b36bbcc7
Diffstat (limited to 'android')
-rw-r--r--android/main-ui.c2
-rw-r--r--android/protocol/attach-ui-impl.c2
-rw-r--r--android/protocol/core-commands-proxy.c2
-rw-r--r--android/protocol/core-connection.c (renamed from android/core-connection.c)2
-rw-r--r--android/protocol/core-connection.h (renamed from android/core-connection.h)0
-rw-r--r--android/protocol/fb-updates-impl.c1
-rw-r--r--android/protocol/fb-updates-impl.h1
-rw-r--r--android/protocol/ui-commands-impl.c2
-rw-r--r--android/protocol/user-events-proxy.c2
9 files changed, 7 insertions, 7 deletions
diff --git a/android/main-ui.c b/android/main-ui.c
index 0486ac1..051f3e8 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -52,7 +52,7 @@
#include "android/display.h"
#include "android/snapshot.h"
-#include "android/core-connection.h"
+#include "android/protocol/core-connection.h"
#include "android/protocol/fb-updates-impl.h"
#include "android/protocol/user-events-proxy.h"
#include "android/protocol/core-commands-proxy.h"
diff --git a/android/protocol/attach-ui-impl.c b/android/protocol/attach-ui-impl.c
index 8ca204c..a61e546 100644
--- a/android/protocol/attach-ui-impl.c
+++ b/android/protocol/attach-ui-impl.c
@@ -16,9 +16,9 @@
* from the Core.
*/
-#include "android/core-connection.h"
#include "android/utils/debug.h"
#include "android/utils/panic.h"
+#include "android/protocol/core-connection.h"
#include "android/protocol/attach-ui-impl.h"
/* Descriptor for the UI-side of the "attach-ui" service. */
diff --git a/android/protocol/core-commands-proxy.c b/android/protocol/core-commands-proxy.c
index a52a376..0a50794 100644
--- a/android/protocol/core-commands-proxy.c
+++ b/android/protocol/core-commands-proxy.c
@@ -17,11 +17,11 @@
#include "console.h"
#include "android/looper.h"
-#include "android/core-connection.h"
#include "android/async-utils.h"
#include "android/sync-utils.h"
#include "android/utils/debug.h"
#include "android/utils/panic.h"
+#include "android/protocol/core-connection.h"
#include "android/protocol/core-commands.h"
#include "android/protocol/core-commands-proxy.h"
#include "android/protocol/core-commands-api.h"
diff --git a/android/core-connection.c b/android/protocol/core-connection.c
index 1099291..6de5386 100644
--- a/android/core-connection.c
+++ b/android/protocol/core-connection.c
@@ -19,8 +19,8 @@
#include "android/android.h"
#include "android/utils/debug.h"
#include "android/globals.h"
-#include "android/core-connection.h"
#include "android/utils/system.h"
+#include "android/protocol/core-connection.h"
/* Descriptor for a client, connected to the core via console port. */
struct CoreConnection {
diff --git a/android/core-connection.h b/android/protocol/core-connection.h
index 5701f8c..5701f8c 100644
--- a/android/core-connection.h
+++ b/android/protocol/core-connection.h
diff --git a/android/protocol/fb-updates-impl.c b/android/protocol/fb-updates-impl.c
index ebe7309..170fb47 100644
--- a/android/protocol/fb-updates-impl.c
+++ b/android/protocol/fb-updates-impl.c
@@ -20,6 +20,7 @@
#include "android/utils/debug.h"
#include "android/utils/panic.h"
#include "android/sync-utils.h"
+#include "android/protocol/core-connection.h"
#include "android/protocol/fb-updates.h"
#include "android/protocol/fb-updates-impl.h"
diff --git a/android/protocol/fb-updates-impl.h b/android/protocol/fb-updates-impl.h
index 0c351aa..2572b5e 100644
--- a/android/protocol/fb-updates-impl.h
+++ b/android/protocol/fb-updates-impl.h
@@ -22,7 +22,6 @@
#include "framebuffer.h"
#include "android/looper.h"
#include "android/async-utils.h"
-#include "android/core-connection.h"
/* Creates framebuffer client, and connects it with the core.
* Param:
diff --git a/android/protocol/ui-commands-impl.c b/android/protocol/ui-commands-impl.c
index 30d5277..f265514 100644
--- a/android/protocol/ui-commands-impl.c
+++ b/android/protocol/ui-commands-impl.c
@@ -18,12 +18,12 @@
#include "console.h"
#include "android/looper.h"
-#include "android/core-connection.h"
#include "android/async-utils.h"
#include "android/sync-utils.h"
#include "android/utils/system.h"
#include "android/utils/debug.h"
#include "android/utils/panic.h"
+#include "android/protocol/core-connection.h"
#include "android/protocol/ui-commands-impl.h"
#include "android/protocol/ui-commands-api.h"
diff --git a/android/protocol/user-events-proxy.c b/android/protocol/user-events-proxy.c
index 2049b68..3796ff9 100644
--- a/android/protocol/user-events-proxy.c
+++ b/android/protocol/user-events-proxy.c
@@ -14,8 +14,8 @@
#include "console.h"
#include "android/looper.h"
#include "android/async-utils.h"
-#include "android/core-connection.h"
#include "android/utils/debug.h"
+#include "android/protocol/core-connection.h"
#include "android/protocol/user-events-protocol.h"
#include "android/protocol/user-events-proxy.h"