diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-06-21 23:03:44 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-21 23:03:45 -0700 |
| commit | a593847491224cfab9eb94b1e36c85333dc081da (patch) | |
| tree | e680d838836d3cad018925130633fe5a3da7b9bc /android/main-emulator.c | |
| parent | 870f03672ca3513fe5d666f425942fda651f30ec (diff) | |
| parent | 342a01fc826881e6b12b7673c7d2c280295f4d9e (diff) | |
| download | external_qemu-a593847491224cfab9eb94b1e36c85333dc081da.zip external_qemu-a593847491224cfab9eb94b1e36c85333dc081da.tar.gz external_qemu-a593847491224cfab9eb94b1e36c85333dc081da.tar.bz2 | |
Merge "[MIPS] Fix startup segfault in emulator64-mips"
Diffstat (limited to 'android/main-emulator.c')
| -rw-r--r-- | android/main-emulator.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/android/main-emulator.c b/android/main-emulator.c index ac4d2e9..0981a71 100644 --- a/android/main-emulator.c +++ b/android/main-emulator.c @@ -148,8 +148,6 @@ 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); |