aboutsummaryrefslogtreecommitdiffstats
path: root/android/config
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-02-09 15:34:16 -0800
committerAndroid Code Review <code-review@android.com>2011-02-09 15:34:16 -0800
commit1ebd6d701f91c34f4562f522d5b2ce32be056d85 (patch)
treec79222448d637e3cf8d9fc5279d0293275812521 /android/config
parentd98942188f1b190b2e2a2a7a4cb11bc4f8a22739 (diff)
parenta39b10bd2574825a815d6ad854499dd127cfa9cb (diff)
downloadexternal_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.zip
external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.tar.gz
external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.tar.bz2
Merge "Build arm and x86 binaries at the same time."
Diffstat (limited to 'android/config')
-rw-r--r--android/config/config.h18
-rw-r--r--android/config/target-arm/config.h5
-rw-r--r--android/config/target-x86/config.h3
3 files changed, 15 insertions, 11 deletions
diff --git a/android/config/config.h b/android/config/config.h
index fdfbe31..e07cc2c 100644
--- a/android/config/config.h
+++ b/android/config/config.h
@@ -1,4 +1,9 @@
-/* Automatically generated by configure - do not modify */
+/* 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.
+ */
#include "config-host.h"
#define TARGET_PHYS_ADDR_BITS 32
@@ -11,13 +16,4 @@
#define CONFIG_NAND_LIMITS 1
#endif
#define CONFIG_ANDROID_SNAPSHOTS 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
-
+#define CONFIG_MEMCHECK 1
diff --git a/android/config/target-arm/config.h b/android/config/target-arm/config.h
new file mode 100644
index 0000000..d6da04f
--- /dev/null
+++ b/android/config/target-arm/config.h
@@ -0,0 +1,5 @@
+/* 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
new file mode 100644
index 0000000..ea31c39
--- /dev/null
+++ b/android/config/target-x86/config.h
@@ -0,0 +1,3 @@
+/* x86-specific configuration */
+#include "android/config/config.h"
+#define TARGET_I386 1