diff options
| -rw-r--r-- | Makefile.android | 2 | ||||
| -rw-r--r-- | android/main-ui.c | 2 | ||||
| -rw-r--r-- | android/protocol/attach-ui-impl.c | 2 | ||||
| -rw-r--r-- | android/protocol/core-commands-proxy.c | 2 | ||||
| -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.c | 1 | ||||
| -rw-r--r-- | android/protocol/fb-updates-impl.h | 1 | ||||
| -rw-r--r-- | android/protocol/ui-commands-impl.c | 2 | ||||
| -rw-r--r-- | android/protocol/user-events-proxy.c | 2 | ||||
| -rw-r--r-- | vl-android-ui.c | 2 |
11 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.android b/Makefile.android index 5faab57..1896cf0 100644 --- a/Makefile.android +++ b/Makefile.android @@ -1212,13 +1212,13 @@ VL_SOURCES := framebuffer.c \ android/display.c \ android/looper-generic.c \ android/snapshot.c \ - android/core-connection.c \ android/main-common.c \ android/main-ui.c \ qemu-timer-ui.c \ vl-android-ui.c \ console-ui.c \ iolooper-select.c \ + android/protocol/core-connection.c \ android/protocol/attach-ui-impl.c \ android/protocol/fb-updates-impl.c \ android/protocol/ui-commands-impl.c \ 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" diff --git a/vl-android-ui.c b/vl-android-ui.c index e818159..c4a396c 100644 --- a/vl-android-ui.c +++ b/vl-android-ui.c @@ -41,7 +41,7 @@ #include "android/globals.h" #include "android/utils/bufprint.h" #include "android/utils/system.h" -#include "android/core-connection.h" +#include "android/protocol/core-connection.h" #include "android/protocol/attach-ui-impl.h" #include "android/protocol/fb-updates-impl.h" #include "android/protocol/user-events-proxy.h" |