Index: build/android/pylib/instrumentation/test_runner.py |
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py |
index 5711291a20af39403301e75662638768e44b3e08..0a448c3384aaa8b8a990e85ad16915367126b465 100644 |
--- a/build/android/pylib/instrumentation/test_runner.py |
+++ b/build/android/pylib/instrumentation/test_runner.py |
@@ -166,7 +166,8 @@ class TestRunner(base_test_runner.BaseTestRunner): |
self.flags.AddFlags(['--disable-fre', '--enable-test-intents']) |
if self.options.device_flags: |
with open(self.options.device_flags) as device_flags_file: |
- self.flags.AddFlags(list(device_flags_file)) |
+ stripped_flags = (l.strip() for l in device_flags_file) |
+ self.flags.AddFlags([flag for flag in stripped_flags if flag]) |
def TearDown(self): |
"""Cleans up the test harness and saves outstanding data from test run.""" |