Commit Graph

7 Commits

Author SHA1 Message Date
bf58a75dd9 removed webrtc_base_tests_utils from merge libs as it was breaking some builds.
BUG=N/A
R=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6177 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-15 21:45:09 +00:00
f048872e91 Adds a modified copy of talk/base to webrtc/base. It is the first step in
migrating talk/base to webrtc/base.

BUG=N/A
R=niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6129 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-13 18:00:26 +00:00
e9a604accd Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome.

http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457


> Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
> 
> BUG=N/A
> R=andrew@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/12199004

TBR=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-13 08:15:48 +00:00
2c7d1b39b9 Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
BUG=N/A
R=andrew@webrtc.org, wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6107 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-12 18:03:09 +00:00
aa1278de46 Rename merged webrtc lib to libwebrtc_merged.a.
The name "libwebrtc.a" was conflicting with the newish webrtc target,
resulting in this error:
$ ./webrtc/build/gyp_webrtc merged_lib.gyp
$ ninja -C out/Debug
ninja: warning: multiple rules generate libwebrtc.a. builds involving
this target will not be correct; continuing anyway
ninja: error: dependency cycle: no_op -> libwebrtc.a -> no_op

BUG=b/12955740
R=stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5528 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-02-11 18:22:29 +00:00
fd0f267bb1 Add new API (webrtc.gyp:webrtc) to merge_libs.gyp.
Required to be able to link new API code against the merged target.
Replaces old dependency on video_engine_core as the new-API target
depends on it for now, and video_engine_core is being phased out.

R=mflodman@webrtc.org
BUG=1667

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5424 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-24 10:43:47 +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