From 33f89d05b375f18596fa5892acaaae356fbb0c0e Mon Sep 17 00:00:00 2001 From: Vladimir Chtchetkine Date: Wed, 28 Sep 2011 09:19:09 -0700 Subject: Fix CPU architecture reported in HW config Change-Id: I9221916514a39435d2710fa9dada92a87bdc4dab --- android/main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'android/main.c') diff --git a/android/main.c b/android/main.c index c2f8663..56ae698 100644 --- a/android/main.c +++ b/android/main.c @@ -455,6 +455,17 @@ int main(int argc, char **argv) opts->trace = tracePath; } + /* Update CPU architecture for HW configs created from build dir. */ + if (inAndroidBuild) { +#if defined(TARGET_ARM) + free(android_hw->hw_cpu_arch); + android_hw->hw_cpu_arch = ASTRDUP("arm"); +#elif defined(TARGET_I386) + free(android_hw->hw_cpu_arch); + android_hw->hw_cpu_arch = ASTRDUP("x86"); +#endif + } + n = 1; /* generate arguments for the underlying qemu main() */ { -- cgit v1.1