Temporary fix for ARMv7 -user builds.
This switches the emulator to "single step" emulation mode which is
slower but seems to work-around the current ARMv7 emulation bug.
This allows the dexreopt passes to go through normally.
diff --git a/tools/dexpreopt/dexpreopt.py b/tools/dexpreopt/dexpreopt.py
index 5dde642..376f135 100755
--- a/tools/dexpreopt/dexpreopt.py
+++ b/tools/dexpreopt/dexpreopt.py
@@ -125,6 +125,10 @@
else:
args += ['-shell']
+ # This is a work-around for the ARMv7 emulation bug.
+ # XXX: It only works by chance, if any ! A real emulation fix is on the way
+ args += ['-qemu', '-singlestep']
+
# Ensure that this environment variable isn't set;
# if it is, the emulator will print the log to stdout.
if os.environ.get('ANDROID_LOG_TAGS'):