Index: build/android/pylib/gtest/dispatch.py |
diff --git a/build/android/pylib/gtest/dispatch.py b/build/android/pylib/gtest/dispatch.py |
index b02331a7d17248e4818c59633f42768124e7a0f2..a3b81230fa3b4c058cc1dc10e35d154dd94bc33e 100644 |
--- a/build/android/pylib/gtest/dispatch.py |
+++ b/build/android/pylib/gtest/dispatch.py |
@@ -120,8 +120,12 @@ def _RunATestSuite(options, suite_name): |
attached_devices = [] |
buildbot_emulators = [] |
+ if options.abi == 'arm': |
+ options.abi = 'armeabi-v7a' |
+ |
if options.use_emulator: |
buildbot_emulators = emulator.LaunchEmulators(options.emulator_count, |
+ options.abi, |
wait_for_boot=True) |
attached_devices = [e.device for e in buildbot_emulators] |
elif options.test_device: |