3 files changed, 11 insertions, 15 deletions
diff --git a/android/config/config.h b/android/config/config.h
index e07cc2c..fdfbe31 100644
--- a/android/config/config.h
+++ b/android/config/config.h
@@ -1,9 +1,4 @@
-/* This file is included by target-specific files under
- * android/config/target-$ARCH/config.h, but contains all config
- * definitions that are independent of the target CPU.
- *
- * Do not include directly.
- */
+/* Automatically generated by configure - do not modify */
 #include "config-host.h"
 
 #define TARGET_PHYS_ADDR_BITS  32
@@ -16,4 +11,13 @@
 #define CONFIG_NAND_LIMITS 1
 #endif
 #define CONFIG_ANDROID_SNAPSHOTS 1
-#define CONFIG_MEMCHECK 1
+
+#ifdef ARCH_FLAGS_x86
+#define TARGET_ARCH "x86"
+#define TARGET_I386 1
+#else
+#define TARGET_ARCH "arm"
+#define TARGET_ARM 1
+#define CONFIG_SOFTFLOAT 1
+#endif
+
diff --git a/android/config/target-arm/config.h b/android/config/target-arm/config.h
deleted file mode 100644
index d6da04f..0000000
--- a/android/config/target-arm/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* ARM-specific configuration */
-#include "android/config/config.h"
-
-#define TARGET_ARM 1
-#define CONFIG_SOFTFLOAT 1
diff --git a/android/config/target-x86/config.h b/android/config/target-x86/config.h
deleted file mode 100644
index ea31c39..0000000
--- a/android/config/target-x86/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* x86-specific configuration */
-#include "android/config/config.h"
-#define TARGET_I386 1