From 83d6b0c254429584e5779ee33382ec82d1306ef5 Mon Sep 17 00:00:00 2001 From: noahric Date: Tue, 21 Jul 2015 12:54:34 -0700 Subject: [PATCH] Ignore genperf lib in merge_libs.py. It's built as a part of the chromium build(?), but causes problems with XCode 7's new bitcode intermediate format. It should really never been included, but it never caused link failures before. BUG= Review URL: https://codereview.webrtc.org/1236383002 Cr-Commit-Position: refs/heads/master@{#9606} --- webrtc/build/merge_libs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/build/merge_libs.py b/webrtc/build/merge_libs.py index f0205947ce..066e3ab39b 100644 --- a/webrtc/build/merge_libs.py +++ b/webrtc/build/merge_libs.py @@ -16,7 +16,7 @@ import os import subprocess import sys -IGNORE_PATTERNS = ['do_not_use', 'protoc'] +IGNORE_PATTERNS = ['do_not_use', 'protoc', 'genperf'] def FindFiles(path, pattern): """Finds files matching |pattern| under |path|.