Index: build/android/test_runner.py |
diff --git a/build/android/test_runner.py b/build/android/test_runner.py |
index b21f7357e41dce3ca5340b55ff436a58355d9dcd..db27e4993ece3bcfa7c37cef88066fc848309b11 100755 |
--- a/build/android/test_runner.py |
+++ b/build/android/test_runner.py |
@@ -19,6 +19,11 @@ import threading |
import traceback |
import unittest |
+# Import _strptime before threaded code. datetime.datetime.strptime is |
+# threadsafe except for the initial import of the _strptime module. |
+# See http://crbug.com/724524 and https://bugs.python.org/issue7980. |
+import _strptime # pylint: disable=unused-import |
+ |
from pylib.constants import host_paths |
if host_paths.DEVIL_PATH not in sys.path: |