diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-09 18:04:23 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-02-09 18:04:23 -0800 |
| commit | fc8ed80ba1362d2ce500003625e1c9c39f765661 (patch) | |
| tree | 760b9c298c8fe37411e174f7bd214ff644cda0ec /android/config | |
| parent | 1ebd6d701f91c34f4562f522d5b2ce32be056d85 (diff) | |
| download | external_qemu-fc8ed80ba1362d2ce500003625e1c9c39f765661.zip external_qemu-fc8ed80ba1362d2ce500003625e1c9c39f765661.tar.gz external_qemu-fc8ed80ba1362d2ce500003625e1c9c39f765661.tar.bz2 | |
Revert "Build arm and x86 binaries at the same time."
This fails to build on MacOS X
This reverts commit a39b10bd2574825a815d6ad854499dd127cfa9cb.
Diffstat (limited to 'android/config')
| -rw-r--r-- | android/config/config.h | 18 | ||||
| -rw-r--r-- | android/config/target-arm/config.h | 5 | ||||
| -rw-r--r-- | android/config/target-x86/config.h | 3 |
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 |