From a39b10bd2574825a815d6ad854499dd127cfa9cb Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 7 Feb 2011 18:10:54 +0100 Subject: Build arm and x86 binaries at the same time. Change-Id: I105c5a097c988cb964b47b40b71c7a08af0d9210 --- android/config/config.h | 18 +++++++----------- android/config/target-arm/config.h | 5 +++++ android/config/target-x86/config.h | 3 +++ 3 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 android/config/target-arm/config.h create mode 100644 android/config/target-x86/config.h (limited to 'android/config') 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 -- cgit v1.1