Move bswap.h to include/qemu/bswap.h
Before integrating upstream patches, we need to move source
files around to match the new directory structure used there.
This is the first of such changes.
Change-Id: Ib42669003851aa5a5295dd66cfebb307c63f054f
diff --git a/Makefile.android b/Makefile.android
index 2e7ac74..73013e3 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -151,6 +151,8 @@
# Needed to build fpu/softfloat-native.h properly
MY_CFLAGS += -D_GNU_SOURCE=1
+MY_CFLAGS += -I$(LOCAL_PATH)/include
+
# A useful function that can be used to start the declaration of a host
# module. Avoids repeating the same stuff again and again.
# Usage:
diff --git a/android/snapshot.c b/android/snapshot.c
index d02d9a8..93ac1b6 100644
--- a/android/snapshot.c
+++ b/android/snapshot.c
@@ -33,7 +33,7 @@
#include <time.h>
#include <unistd.h>
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "android/utils/debug.h"
#include "android/utils/system.h"
#include "android/snapshot.h"
diff --git a/block/dmg.c b/block/dmg.c
index a3c815b..088d469 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block_int.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "module.h"
#include <zlib.h>
diff --git a/cpu-common.h b/cpu-common.h
index 9e32177..53f63fe 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -15,7 +15,7 @@
#include "poison.h"
#endif
-#include "bswap.h"
+#include "qemu/bswap.h"
#include "qemu-queue.h"
#if !defined(CONFIG_USER_ONLY)
diff --git a/bswap.h b/include/qemu/bswap.h
similarity index 100%
rename from bswap.h
rename to include/qemu/bswap.h
diff --git a/qemu-common.h b/qemu-common.h
index 097e1fc..f000c6e 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -122,7 +122,7 @@
#include <setjmp.h>
#include "osdep.h"
-#include "bswap.h"
+#include "qemu/bswap.h"
#else
