| commit | 9d09418933ea2f75cc416e5ce38d15f62acd5c9a | [log] [tgz] |
|---|---|---|
| author | Marcin Radomski <dextero@google.com> | Wed Jun 15 10:05:21 2022 |
| committer | Mark Mentovai <mark@chromium.org> | Thu Jul 14 14:20:32 2022 |
| tree | 9df8ba10e75de718504c485501e1b4e6c283384d | |
| parent | 9ecf45e37677743503342ee4c6a76eaee80e4a7f [diff] |
Import OrderedDict from collections, not collections_abc This was a mistake introduced in https://chromium-review.googlesource.com/c/external/gyp/+/3536247 that broke Windows breakpad build. See https://github.com/chromium/gyp/commit/bc83cdacf5428ab6ddcc92fd0b0fc494cc9a4d4f#commitcomment-75762564 Bug: b/217559564 Change-Id: I3e44da6f4e40ad062106877f24021b5039a458b2 Reviewed-on: https://chromium-review.googlesource.com/c/external/gyp/+/3706740 Reviewed-by: Mark Mentovai <mark@chromium.org>
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py index 8014ad1..263b312 100644 --- a/pylib/gyp/generator/msvs.py +++ b/pylib/gyp/generator/msvs.py
@@ -11,8 +11,7 @@ import re import subprocess import sys - -from six.moves import collections_abc +import collections import gyp.common import gyp.easy_xml as easy_xml @@ -196,7 +195,7 @@ if not prefix: prefix = [] result = [] excluded_result = [] - folders = collections_abc.OrderedDict() + folders = collections.OrderedDict() # Gather files into the final result, excluded, or folders. for s in sources: if len(s) == 1: