3 files changed, 25 insertions, 35 deletions
diff --git a/android/config/Linux/config-host.h b/android/config/Linux/config-host.h
deleted file mode 100644
index cc5e07a..0000000
--- a/android/config/Linux/config-host.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Automatically generated by configure - do not modify */
-#define CONFIG_QEMU_SHAREDIR "/usr/local/share/qemu"
-#define HOST_I386 1
-#define HOST_LONG_BITS 32
-#define HAVE_BYTESWAP_H 1
-#define CONFIG_GDBSTUB 1
-#define CONFIG_SLIRP 1
-#define QEMU_VERSION "0.8.2"
-#define QEMU_PKGVERSION "Android"
-#define CONFIG_SKINS 1
-#define CONFIG_UNAME_RELEASE ""
diff --git a/android/config/linux-x86/config-host.h b/android/config/linux-x86/config-host.h
index 894cbe6..2dba514 100644
--- a/android/config/linux-x86/config-host.h
+++ b/android/config/linux-x86/config-host.h
@@ -1,16 +1,17 @@
-/* Automatically generated by configure - do not modify */
-#define CONFIG_QEMU_SHAREDIR "/usr/local/share/qemu"
-#define HOST_I386 1
-#define HOST_LONG_BITS 32
+/* This file was autogenerated by 'android-configure.sh' */
+#define CONFIG_QEMU_SHAREDIR   "/usr/local/share/qemu"
+#define HOST_LONG_BITS  32
 #define CONFIG_BYTESWAP_H 1
-#define CONFIG_FNMATCH 1
-#define CONFIG_GDBSTUB 1
-#define CONFIG_SLIRP 1
-#define QEMU_VERSION "0.10.50"
+#define CONFIG_FNMATCH  1
+#define CONFIG_GDBSTUB  1
+#define CONFIG_SLIRP    1
+#define CONFIG_SKINS    1
+#define CONFIG_TRACE    1
+#define CONFIG_FDATASYNC    1
+#define CONFIG_NAND_LIMITS  1
+#define QEMU_VERSION    "0.10.50"
 #define QEMU_PKGVERSION "Android"
-#define CONFIG_SKINS 1
-#define CONFIG_UNAME_RELEASE ""
-#define CONFIG_IOTHREAD 1
+#define HOST_I386    1
 #define CONFIG_IOVEC 1
-#define CONFIG_FDATASYNC 1
-#define CONFIG_ANDROID 1
+#define CONFIG_LINUX   1
+#define CONFIG_ANDROID       1
diff --git a/android/config/windows/config-host.h b/android/config/windows/config-host.h
index a1b022e..ef36e4c 100644
--- a/android/config/windows/config-host.h
+++ b/android/config/windows/config-host.h
@@ -1,12 +1,12 @@
-/* Automatically generated by configure - do not modify */
-#define CONFIG_QEMU_SHAREDIR "/usr/local/share/qemu"
-#define HOST_I386 1
-#define HOST_LONG_BITS 32
-#define CONFIG_WIN32 1
-#define CONFIG_GDBSTUB 1
-#define CONFIG_SLIRP 1
-#define QEMU_VERSION "0.10.50"
+/* This file was autogenerated by 'android-configure.sh' */
+#define CONFIG_QEMU_SHAREDIR   "/usr/local/share/qemu"
+#define HOST_LONG_BITS  32
+#define CONFIG_GDBSTUB  1
+#define CONFIG_SLIRP    1
+#define CONFIG_SKINS    1
+#define CONFIG_TRACE    1
+#define QEMU_VERSION    "0.10.50"
 #define QEMU_PKGVERSION "Android"
-#define CONFIG_SKINS 1
-#define CONFIG_UNAME_RELEASE ""
-#define CONFIG_ANDROID 1
+#define HOST_I386    1
+#define CONFIG_WIN32   1
+#define CONFIG_ANDROID       1