From 8f35afab8cd4a860d3fc6962fd87e440f39e7245 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Thu, 16 Jan 2014 00:31:57 +0000 Subject: [PATCH] Exclude protoc objects from merge_libs.py. BUG=b/12567343 R=wjia@webrtc.org Review URL: https://webrtc-codereview.appspot.com/7249004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5391 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/merge_libs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webrtc/build/merge_libs.py b/webrtc/build/merge_libs.py index 5edae3964e..1e78c68125 100644 --- a/webrtc/build/merge_libs.py +++ b/webrtc/build/merge_libs.py @@ -21,7 +21,8 @@ def FindFiles(path, pattern): """Finds files matching |pattern| under |path|. Returns a list of file paths matching |pattern|, by walking the directory tree - under |path|. Filenames containing the string 'do_not_use' are excluded. + under |path|. Filenames containing the string 'do_not_use' or 'protoc' are + excluded. Args: path: The root path for the search. @@ -34,7 +35,7 @@ def FindFiles(path, pattern): files = [] for root, _, filenames in os.walk(path): for filename in fnmatch.filter(filenames, pattern): - if 'do_not_use' not in filename: + if 'do_not_use' not in filename and 'protoc' not in filename: # We use the relative path here to avoid "argument list too long" # errors on Linux. files.append(os.path.relpath(os.path.join(root, filename)))