Move android-trace.h to include/android/
+ android-trace_common.h -> include/android/trace_common.h
NOTE: trace_common.h is still in the top-level directory because
the qtools first need to be updated to include the header
at include/android/trace_common.h
+ trace.c -> android/
+ user-events.h -> include/android/
+ user-events-qemu.c -> android/
Change-Id: Idbf59c8b1a5cc2872f035eb3fa7f9922755f357d
diff --git a/Makefile.target b/Makefile.target
index f981ead..0cab90e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -167,7 +167,7 @@
cpu-exec.c \
exec.c \
translate-all.c \
- trace.c \
+ android/trace.c \
varint.c \
softmmu_outside_jit.c
@@ -337,7 +337,6 @@
monitor.c \
qemu-timer.c \
qemu-timer-common.c \
- user-events-qemu.c \
vl-android.c \
android/console.c \
android/opengles.c \
@@ -348,6 +347,7 @@
android/protocol/ui-commands-proxy.c \
android/protocol/core-commands-impl.c \
android/protocol/core-commands-qemu.c \
+ android/user-events-qemu.c \
ui/keymaps.c \
$(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c)
@@ -417,7 +417,6 @@
monitor.c \
qemu-timer.c \
qemu-timer-common.c \
- user-events-qemu.c \
vl-android.c \
android/cmdline-option.c \
android/console.c \
@@ -429,6 +428,7 @@
android/opengles.c \
android/protocol/core-commands-qemu.c \
android/protocol/ui-commands-qemu.c \
+ android/user-events-qemu.c \
ui/keymaps.c \
diff --git a/android/console.c b/android/console.c
index 51209cf..b356d7c 100644
--- a/android/console.c
+++ b/android/console.c
@@ -47,7 +47,7 @@
#include <unistd.h>
#include <fcntl.h>
#include "android/hw-events.h"
-#include "user-events.h"
+#include "android/user-events.h"
#include "android/hw-sensors.h"
#include "android/keycode-array.h"
#include "android/charmap.h"
diff --git a/android/keycode-array.c b/android/keycode-array.c
index cf7ec21..abaaf2a 100644
--- a/android/keycode-array.c
+++ b/android/keycode-array.c
@@ -13,7 +13,7 @@
#include <stdio.h>
#include "android/utils/debug.h"
#include "android/keycode-array.h"
-#include "user-events.h"
+#include "android/user-events.h"
void
android_keycodes_add_key_event( AKeycodeBuffer* keycodes,
diff --git a/android/main.c b/android/main.c
index 61f794a..9f88bf5 100644
--- a/android/main.c
+++ b/android/main.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "sysemu.h"
#include "ui/console.h"
-#include "user-events.h"
+#include "android/user-events.h"
#include <SDL.h>
#include <SDL_syswm.h>
diff --git a/android/multitouch-screen.c b/android/multitouch-screen.c
index 36f937d..4cf4fee 100644
--- a/android/multitouch-screen.c
+++ b/android/multitouch-screen.c
@@ -15,7 +15,7 @@
*/
#include "qemu-common.h"
-#include "user-events.h"
+#include "android/user-events.h"
#include "android/display-core.h"
#include "android/hw-events.h"
#include "android/charmap.h"
diff --git a/android/protocol/core-commands-impl.c b/android/protocol/core-commands-impl.c
index bf6da15..8d2596e 100644
--- a/android/protocol/core-commands-impl.c
+++ b/android/protocol/core-commands-impl.c
@@ -19,7 +19,7 @@
#include "android/android.h"
#include "android/globals.h"
#include "telephony/modem_driver.h"
-#include "android-trace.h"
+#include "android/trace.h"
#include "android/looper.h"
#include "android/async-utils.h"
#include "android/sync-utils.h"
diff --git a/android/protocol/core-commands-qemu.c b/android/protocol/core-commands-qemu.c
index 76b3abb..d888f9b 100644
--- a/android/protocol/core-commands-qemu.c
+++ b/android/protocol/core-commands-qemu.c
@@ -19,7 +19,7 @@
#include "android/globals.h"
#include "android/hw-sensors.h"
#include "telephony/modem_driver.h"
-#include "android-trace.h"
+#include "android/trace.h"
#include "audio/audio.h"
#include "android/protocol/core-commands-api.h"
diff --git a/android/protocol/user-events-impl.c b/android/protocol/user-events-impl.c
index 7df820e..f45169a 100644
--- a/android/protocol/user-events-impl.c
+++ b/android/protocol/user-events-impl.c
@@ -15,7 +15,7 @@
* handle user events sent from the UI.
*/
-#include "user-events.h"
+#include "android/user-events.h"
#include "android/globals.h"
#include "android/android.h"
#include "android/looper.h"
diff --git a/android/protocol/user-events-proxy.c b/android/protocol/user-events-proxy.c
index 16bd9f4..3bd0bee 100644
--- a/android/protocol/user-events-proxy.c
+++ b/android/protocol/user-events-proxy.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
-#include "user-events.h"
+#include "android/user-events.h"
#include "ui/console.h"
#include "android/looper.h"
#include "android/async-utils.h"
diff --git a/android/qemulator.c b/android/qemulator.c
index eb3b59e..b625be6 100644
--- a/android/qemulator.c
+++ b/android/qemulator.c
@@ -16,7 +16,7 @@
#include "android/qemulator.h"
#include "android/protocol/core-commands-api.h"
#include "android/protocol/ui-commands-api.h"
-#include "user-events.h"
+#include "android/user-events.h"
#define D(...) do { if (VERBOSE_CHECK(init)) dprint(__VA_ARGS__); } while (0)
static double get_default_scale( AndroidOptions* opts );
diff --git a/android/skin/trackball.c b/android/skin/trackball.c
index 6fac1cb..35db038 100644
--- a/android/skin/trackball.c
+++ b/android/skin/trackball.c
@@ -12,7 +12,7 @@
#include "android/skin/trackball.h"
#include "android/skin/image.h"
#include "android/utils/system.h"
-#include "user-events.h"
+#include "android/user-events.h"
#include <math.h>
/***********************************************************************/
diff --git a/android/skin/window.c b/android/skin/window.c
index 71ac34d..b588549 100644
--- a/android/skin/window.c
+++ b/android/skin/window.c
@@ -18,7 +18,7 @@
#include "android/utils/duff.h"
#include "android/protocol/core-commands-api.h"
#include <SDL_syswm.h>
-#include "user-events.h"
+#include "android/user-events.h"
#include <math.h>
#include "android/framebuffer.h"
diff --git a/trace.c b/android/trace.c
similarity index 99%
rename from trace.c
rename to android/trace.c
index fabfed5..006582e 100644
--- a/trace.c
+++ b/android/trace.c
@@ -22,7 +22,7 @@
#include <time.h>
#include "cpu.h"
#include "exec/exec-all.h"
-#include "android-trace.h"
+#include "android/trace.h"
#include "varint.h"
#include "android/utils/path.h"
diff --git a/user-events-qemu.c b/android/user-events-qemu.c
similarity index 97%
rename from user-events-qemu.c
rename to android/user-events-qemu.c
index 518a4c0..4efab76 100644
--- a/user-events-qemu.c
+++ b/android/user-events-qemu.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "user-events.h"
+#include "android/user-events.h"
#include "android/utils/debug.h"
#include "ui/console.h"
#include <stdio.h>
diff --git a/async.c b/async.c
index 57ac3a8..798af46 100644
--- a/async.c
+++ b/async.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
-#include "qemu-aio.h"
+#include "block/qemu-aio.h"
/*
* An AsyncContext protects the callbacks of AIO requests and Bottom Halves
diff --git a/block.h b/block.h
index d83a24b..7c74fe0 100644
--- a/block.h
+++ b/block.h
@@ -1,7 +1,7 @@
#ifndef BLOCK_H
#define BLOCK_H
-#include "qemu-aio.h"
+#include "block/qemu-aio.h"
#include "qemu-common.h"
#include "qemu-option.h"
#include "qapi/qmp/qobject.h"
diff --git a/hw/goldfish_events_device.c b/hw/goldfish_events_device.c
index d6a6d82..9dcfa01 100644
--- a/hw/goldfish_events_device.c
+++ b/hw/goldfish_events_device.c
@@ -15,7 +15,7 @@
#include "android/globals.h" /* for android_hw */
#include "android/multitouch-screen.h"
#include "irq.h"
-#include "user-events.h"
+#include "android/user-events.h"
#include "ui/console.h"
#define MAX_EVENTS 256*4
diff --git a/hw/goldfish_trace.c b/hw/goldfish_trace.c
index b384cd9..667faa0 100644
--- a/hw/goldfish_trace.c
+++ b/hw/goldfish_trace.c
@@ -17,7 +17,7 @@
#include "goldfish_trace.h"
#include "goldfish_vmem.h"
#include "sysemu.h"
-#include "android-trace.h"
+#include "android/trace.h"
#ifdef CONFIG_MEMCHECK
#include "memcheck/memcheck.h"
#include "memcheck/memcheck_util.h"
diff --git a/android-trace.h b/include/android/trace.h
similarity index 97%
rename from android-trace.h
rename to include/android/trace.h
index 2d0100d..a492667 100644
--- a/android-trace.h
+++ b/include/android/trace.h
@@ -14,7 +14,7 @@
#define TRACE_H
#include <inttypes.h>
-#include "android-trace_common.h"
+#include "android/trace_common.h"
extern uint64_t start_time, end_time;
extern uint64_t elapsed_usecs;
diff --git a/android-trace_common.h b/include/android/trace_common.h
similarity index 100%
rename from android-trace_common.h
rename to include/android/trace_common.h
diff --git a/user-events.h b/include/android/user-events.h
similarity index 100%
rename from user-events.h
rename to include/android/user-events.h
diff --git a/qemu-aio.h b/include/block/qemu-aio.h
similarity index 100%
rename from qemu-aio.h
rename to include/block/qemu-aio.h
diff --git a/trace.h b/include/trace.h
similarity index 100%
rename from trace.h
rename to include/trace.h
diff --git a/target-arm/helper-android.c b/target-arm/helper-android.c
index b99a22d..f0450cf 100644
--- a/target-arm/helper-android.c
+++ b/target-arm/helper-android.c
@@ -24,7 +24,7 @@
}
#ifdef CONFIG_TRACE
-#include "android-trace.h"
+#include "android/trace.h"
void HELPER(traceTicks)(uint32_t ticks)
{
diff --git a/target-arm/helper.c b/target-arm/helper.c
index f1ea877..d4cd851 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -11,7 +11,7 @@
#if !defined(CONFIG_USER_ONLY)
//#include "hw/loader.h"
#ifdef CONFIG_TRACE
-#include "android-trace.h"
+#include "android/trace.h"
#endif
#endif
diff --git a/target-arm/translate-android.h b/target-arm/translate-android.h
index 274c876..fe13f0f 100644
--- a/target-arm/translate-android.h
+++ b/target-arm/translate-android.h
@@ -277,7 +277,7 @@
#ifdef CONFIG_TRACE
-#include "android-trace.h"
+#include "android/trace.h"
#define gen_traceInsn() gen_helper_traceInsn()
static void
diff --git a/trace_common.h b/trace_common.h
index b2a2188..fcbf0b8 100644
--- a/trace_common.h
+++ b/trace_common.h
@@ -1,4 +1,4 @@
/* This file should be removed once we update the Android qtools to
* include 'android-trace_common.h' directly.
*/
-#include "android-trace_common.h"
+#include "android/trace_common.h"
diff --git a/vl-android.c b/vl-android.c
index 6403414..255b554 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -231,7 +231,7 @@
#include "disas.h"
#ifdef CONFIG_TRACE
-#include "android-trace.h"
+#include "android/trace.h"
#endif
#include "qemu_socket.h"