Ensure j2objc_dead_code_pruner works with and without hash at the end of filenames. RELNOTES: None PiperOrigin-RevId: 187252891
diff --git a/tools/objc/j2objc_dead_code_pruner.py b/tools/objc/j2objc_dead_code_pruner.py index 218a8d4..62b8bc7 100755 --- a/tools/objc/j2objc_dead_code_pruner.py +++ b/tools/objc/j2objc_dead_code_pruner.py
@@ -314,7 +314,7 @@ """ 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)