diff options
| author |  Googler <noreply@google.com> | 2018-02-27 16:41:05 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-27 16:43:08 -0800 |
| commit | 769d0a93bfb8628e88c16f0b942c8aa9c1534907 (patch) | |
| tree | 58b45fe0258bb476566550630524ead31d925150 /tools/objc | |
| parent | b4e8cd7beddc3c29acf7629d4e6eef9b6ca67c5f (diff) | |
Ensure j2objc_dead_code_pruner works with and without hash at the end of filenames.
RELNOTES: None
PiperOrigin-RevId: 187252891
Diffstat (limited to 'tools/objc')
| -rwxr-xr-x | tools/objc/j2objc_dead_code_pruner.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/objc/j2objc_dead_code_pruner.py b/tools/objc/j2objc_dead_code_pruner.py index 218a8d4a94..62b8bc79f5 100755 --- a/tools/objc/j2objc_dead_code_pruner.py +++ b/tools/objc/j2objc_dead_code_pruner.py @@ -314,7 +314,7 @@ def MatchObjectNamesInArchive(xcrunwrapper, archive, object_names): """ ar_contents_cmd = '%s ar -t %s' % (xcrunwrapper, archive) real_object_names = subprocess.check_output(ar_contents_cmd, shell=True) - expected_object_name_regex = '^(?:%s)_[0-9a-f]{32}.o' % ( + expected_object_name_regex = r'^(?:%s)(?:_[0-9a-f]{32})?\.o$' % ( '|'.join([re.escape(name) for name in object_names])) return re.findall(expected_object_name_regex, real_object_names, flags=re.MULTILINE) |