diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-05-06 20:21:51 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-06 20:21:53 -0700 |
| commit | 9d26d64c356817e2f320e8aee958012ee6c5bed5 (patch) | |
| tree | 346a703799d4f5f1d46440d404066b8a2c9c8af7 | |
| parent | 401b9424929f17eb7441a54900f7eb848f07b85f (diff) | |
| parent | 9e15745b9f828db4eedf90a811becac95e02d5d3 (diff) | |
| download | external_qemu-9d26d64c356817e2f320e8aee958012ee6c5bed5.zip external_qemu-9d26d64c356817e2f320e8aee958012ee6c5bed5.tar.gz external_qemu-9d26d64c356817e2f320e8aee958012ee6c5bed5.tar.bz2 | |
Merge "Emulator64-mips segfaults, disable it for now."
| -rw-r--r-- | android/main-emulator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android/main-emulator.c b/android/main-emulator.c index 0981a71..ac4d2e9 100644 --- a/android/main-emulator.c +++ b/android/main-emulator.c @@ -148,6 +148,8 @@ int main(int argc, char** argv) avdArch = "arm"; D("Can't determine target AVD architecture: defaulting to %s\n", avdArch); } + if (!strcmp(avdArch, "mips")) + force_32bit = 1; /* emulator64-mips segfaults currently, 4-19-2012 */ /* Find the architecture-specific program in the same directory */ emulatorPath = getTargetEmulatorPath(argv[0], avdArch, force_32bit); |