From 63fd760a37905c45d26fc3d49cac261fad1b4808 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Mon, 9 Oct 2017 15:45:33 -0400 Subject: Remove trailing whitespace. Also adds a presubmit to prevent adding trailing whitespace to source code in the future. Change-Id: I41a4df81487f6f00aa19b188f0cac6a3377efde6 Reviewed-on: https://skia-review.googlesource.com/57380 Reviewed-by: Ravi Mistry Reviewed-by: Mike Reed Commit-Queue: Ben Wagner --- tools/merge_static_libs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/merge_static_libs.py') diff --git a/tools/merge_static_libs.py b/tools/merge_static_libs.py index 842be18c84..a32c3a5024 100755 --- a/tools/merge_static_libs.py +++ b/tools/merge_static_libs.py @@ -15,7 +15,7 @@ def _Usage(): def MergeLibs(in_libs, out_lib): """ Merges multiple static libraries into one. - + in_libs: list of paths to static libraries to be merged out_lib: path to the static library which will be created from in_libs """ @@ -38,12 +38,12 @@ def MergeLibs(in_libs, out_lib): proc.wait() if proc.poll() == 0: # The static library is non-thin, and we extracted objects - for object in current_objects: - objects.append(os.path.abspath(object)) + for obj in current_objects: + objects.append(os.path.abspath(obj)) elif 'thin archive' in proc.communicate()[0]: # The static library is thin, so it contains the paths to its objects - for object in current_objects: - objects.append(object) + for obj in current_objects: + objects.append(obj) else: raise Exception('Failed to extract objects from %s.' % in_lib) os.chdir(curdir) -- cgit v1.2.3