Commit Graph

60 Commits

Author SHA1 Message Date
5f2c81c17f webrtc/base: Fixes miss in base.gyp for windows. See https://code.google.com/p/webrtc/source/browse/trunk/talk/libjingle.gyp?r=6503#764 for the corresponding condition.
BUG=3379
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6615 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-07 17:42:45 +00:00
4ddcc40d32 pkg-config-wrapper should not be run when build_nss is disabled (=0).
BUG=b/15411893
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6538 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-25 20:14:13 +00:00
a685c9df62 base: Renaming + conforming: post commit review changes for https://webrtc-codereview.appspot.com/17699005/
BUG=N/A
R=niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6467 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-17 14:48:44 +00:00
9f36c087f1 Makes it possible to prevent some third party libraries (jsoncpp and openssl) from being linked. This makes it possible to link webrtc with external implementations of those libraries in case the project depending on webrtc requires another version of those libraries.
BUG=3379
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6455 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-16 21:35:20 +00:00
1e3c5c248a Importing ThreadChecker class from Chromium
The ThreadChecker class is imported/re-implemented from Chromium.
The implementation is changed to depend on WebRTC primitives.

R=andrew@webrtc.org, henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6446 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-16 11:34:44 +00:00
2bae3211b1 Add missing sources to webrtc/base/base.gyp
During my work on setting up a GN build for
WebRTC, I discovered that the base.gyp is trying
to remove source files (for the Chromium build)
that are not added in the initial set.
I assume these files should be listed and that
GYP just doesn't complain when it's trying to
remove a file that is not present in the sources
list.

natserver_main.cc is also removed, since it's not used anywhere.

There are also a couple of other header files that are
used in other code that probably also should be listed in
base.gyp (please do this in another CL):
* compile_assert.h
* dscp.h
* move.h
* template_util.h

BUG=None
TEST=Trybots passing clobber compile step.
R=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6438 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-16 07:11:19 +00:00
7ca1edb31d Remove IOKit linkage from iOS builds.
IOKit has been removed in iOS7, so link fails. iOS build succeeds after removing this setting and the corresponding one in talk/libjingle.gyp. Presubmit script tells me that CLs aren't allowed to touch both talk/ and webrtc/ at the same time so doing this separately.

BUG=
R=fischman@webrtc.org, niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6191 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-19 21:05:10 +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