diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-05-06 21:26:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-06 21:26:09 -0700 |
| commit | 2485e9e3412fbe9e27bb2d44950106349988dca6 (patch) | |
| tree | c4ce7458982c2c818168e4ce22f080c2c4d3e5d6 /android | |
| parent | eeed89db2546625b11bad0e8f812792c02f3cb65 (diff) | |
| parent | 9d26d64c356817e2f320e8aee958012ee6c5bed5 (diff) | |
| download | external_qemu-2485e9e3412fbe9e27bb2d44950106349988dca6.zip external_qemu-2485e9e3412fbe9e27bb2d44950106349988dca6.tar.gz external_qemu-2485e9e3412fbe9e27bb2d44950106349988dca6.tar.bz2 | |
am 9d26d64c: Merge "Emulator64-mips segfaults, disable it for now."
* commit '9d26d64c356817e2f320e8aee958012ee6c5bed5':
Emulator64-mips segfaults, disable it for now.
Diffstat (limited to 'android')
| -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); |