summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkjellander@webrtc.org <kjellander@webrtc.org>2014-09-11 09:22:13 +0000
committerkjellander@webrtc.org <kjellander@webrtc.org>2014-09-11 09:22:13 +0000
commitecd58e4b30833134c1c67fd70cdb44e8b9ccb695 (patch)
tree4ca304499135dcafc6a593bd6fc6c2806cfe30b3
parent6e1ddd9984481123c86d6016e9f9f60a8d0249d3 (diff)
downloadwebrtc-ecd58e4b30833134c1c67fd70cdb44e8b9ccb695.tar.gz
Restore webrtc_base target until r7140 is rolled into Chromium.
In r7140 the webrtc_base target was renamed to rtc_base. This breaks our FYI bots for rolling WebRTC in Chromium's DEPS. By re-adding a None target named webrtc_base, this transition should be smoother. TBR=henrikg@webrtc.org, TESTED=Passed build/gyp_chromium on a Chromium checkout with src/third_party/webrtc replaced by a mount like this: cd /path/to/chromium/src sudo mount --bind /path/to/webrtc/trunk/webrtc third_party/webrtc Review URL: https://webrtc-codereview.appspot.com/23589004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7150 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--base/base.gyp10
1 files changed, 10 insertions, 0 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 6c9fd0e9..bfc6ef9d 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -25,6 +25,16 @@
],
'targets': [
{
+ # Temporary target until Chromium's
+ # src/third_party/libjingle/libjingle.gyp is updated to use rtc_base.
+ # TODO(kjellander): Remove when r7140 is rolled into Chromium's DEPS.
+ 'target_name': 'webrtc_base',
+ 'type': 'none',
+ 'dependencies': [
+ 'rtc_base',
+ ],
+ },
+ {
'target_name': 'rtc_base',
'type': 'static_library',
'defines': [