diff options
author | Googler <noreply@google.com> | 2016-05-04 15:36:15 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-05-04 18:32:11 +0000 |
commit | f8f1be3626edb6244eebe48fa6f36bea6275d72c (patch) | |
tree | e77f22cf0557577df69dd95ab2aa6abce734c39d /tools/objc | |
parent | 54fc221026b9dafec6aa0e65ce01aa90d3be2747 (diff) |
Rollback of commit c9f2881f2540a7aa7c5f6d76f4bdad5d35d1c3b6.
*** Reason for rollback ***
Seems to have broken exoblaze builds. https://paste.googleplex.com/5185376662585344 happens when rebuilding after a trivial change (removed a single method).
*** Original change description ***
Rollforward of "Workaround for duplicate input basename bug in apple's libtool", with regex fix
--
MOS_MIGRATED_REVID=121483994
Diffstat (limited to 'tools/objc')
-rwxr-xr-x | tools/objc/j2objc_dead_code_pruner.py | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/tools/objc/j2objc_dead_code_pruner.py b/tools/objc/j2objc_dead_code_pruner.py index 9f787cbf0a..503d818c01 100755 --- a/tools/objc/j2objc_dead_code_pruner.py +++ b/tools/objc/j2objc_dead_code_pruner.py @@ -30,7 +30,6 @@ from collections import OrderedDict import multiprocessing import os import Queue -import re import shutil import subprocess import threading @@ -296,34 +295,10 @@ def PruneSourceFiles(input_files, output_files, dependency_mapping_files, file_shutil) -def MatchObjectNamesInArchive(xcrunwrapper, archive, object_names): - """Returns object names matching their identity in an archive file. - - The linker that blaze uses appends an md5 hash to object file - names prior to inclusion in the archive file. Thus, object names - such as 'foo.o' need to be matched to their appropriate name in - the archive file, such as 'foo_<hash>.o'. - - Args: - xcrunwrapper: A wrapper script over xcrun. - archive: The location of the archive file. - object_names: The expected basenames of object files to match, - sans extension. For example 'foo' (not 'foo.o'). - Returns: - A list of basenames of matching members of the given archive - """ - 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' % ( - '|'.join([re.escape(name) for name in object_names])) - return re.findall(expected_object_name_regex, real_object_names, - flags=re.MULTILINE) - - def PruneArchiveFile(input_archive, output_archive, dummy_archive, dependency_mapping_files, header_mapping_files, archive_source_mapping_files, entry_classes, xcrunwrapper, - file_open=open): + file_open=open, proc_exe=subprocess.check_call): """Remove unreachable objects from archive file. Args: @@ -340,6 +315,7 @@ def PruneArchiveFile(input_archive, output_archive, dummy_archive, xcrunwrapper: A wrapper script over xcrun. file_open: Reference to the builtin open function so it may be overridden for testing. + proc_exe: Object that can execute a command line process. """ reachability_file_mapping = BuildReachabilityTree( dependency_mapping_files, file_open) @@ -359,7 +335,7 @@ def PruneArchiveFile(input_archive, output_archive, dummy_archive, for source_file in source_files: if os.path.splitext(source_file)[0] not in reachable_files_set: unreachable_object_names.append( - os.path.basename(os.path.splitext(source_file)[0])) + os.path.basename(os.path.splitext(source_file)[0]) + '.o') # There are unreachable objects in the archive to prune if unreachable_object_names: @@ -374,8 +350,6 @@ def PruneArchiveFile(input_archive, output_archive, dummy_archive, # Make the output archive editable j2objc_cmd += 'chmod +w %s;' % (output_archive) # Remove the unreachable objects from the archive - unreachable_object_names = MatchObjectNamesInArchive( - xcrunwrapper, input_archive, unreachable_object_names) j2objc_cmd += '%s ar -d -s %s %s;' % ( xcrunwrapper, output_archive, ' '.join(unreachable_object_names)) # Update the table of content of the archive file @@ -388,7 +362,7 @@ def PruneArchiveFile(input_archive, output_archive, dummy_archive, else: j2objc_cmd = 'cp %s %s' % (input_archive, output_archive) - subprocess.check_output(j2objc_cmd, stderr=subprocess.STDOUT, shell=True) + proc_exe(j2objc_cmd, stderr=subprocess.STDOUT, shell=True) if __name__ == '__main__': |