Commit Graph

7 Commits

Author SHA1 Message Date
83d6b0c254 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}
2015-07-21 19:54:44 +00:00
fbe5b316bf Fix merge_libs.py to correctly use the IGNORE_PATTERNS list.
The current version accidentally confused two different uses of "in"; it
replaced "substring in string" logic with "item in list" logic, which
won't work for substring matches.

BUG=
R=kjellander@webrtc.org, pthatcher@webrtc.org, tkchin@webrtc.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/47889004

Cr-Commit-Position: refs/heads/master@{#8942}
2015-04-07 18:41:39 +00:00
1e7d60e451 merge_libs.py: fixes Windows breakage: there should be no space after "lib /OUT:".
TBR=andrew@webrtc.org
BUG=b/15773179

Review URL: https://webrtc-codereview.appspot.com/16999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6793 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-29 04:45:23 +00:00
c7b8f39e2e Fixes "argument list too long" problem on Linux by using the "find" command instead of re-implementing one in python.
R=pbos@webrtc.org
TBR=andrew@webrtc.org
BUG=b/15773179

Review URL: https://webrtc-codereview.appspot.com/18929004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6782 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-25 18:36:55 +00:00
8f35afab8c 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
2014-01-16 00:31:57 +00:00
dd5482cd2f Use ninja with merge_libs.py on Windows and clean up.
BUG=b/8110634

Review URL: https://webrtc-codereview.appspot.com/1094006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3571 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-02-26 02:47:50 +00:00
14b43beb7c Move src/ -> webrtc/
TBR=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/915006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2963 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-10-22 18:19:23 +00:00