summaryrefslogtreecommitdiff
path: root/webrtc.gyp
diff options
context:
space:
mode:
authorperkj@webrtc.org <perkj@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-05-13 08:15:48 +0000
committerperkj@webrtc.org <perkj@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-05-13 08:15:48 +0000
commit50daa5310285079d9e5155b2bc0c95210756e593 (patch)
tree324e54bd35c21091206bd854803a7b711723c6d7 /webrtc.gyp
parentc9ccea39fb320a846deef9ac31a66a50197a554b (diff)
downloadwebrtc-50daa5310285079d9e5155b2bc0c95210756e593.tar.gz
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/webrtc@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc.gyp')
-rw-r--r--webrtc.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/webrtc.gyp b/webrtc.gyp
index f376c064..e78dba6f 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -19,7 +19,6 @@
],
'variables': {
'webrtc_all_dependencies': [
- 'base/base.gyp:*',
'common_audio/common_audio.gyp:*',
'common_video/common_video.gyp:*',
'modules/modules.gyp:*',
@@ -40,7 +39,6 @@
'conditions': [
['include_tests==1', {
'dependencies': [
- 'base/base_tests.gyp:*',
'common_video/common_video_unittests.gyp:*',
'system_wrappers/source/system_wrappers_tests.gyp:*',
'test/metrics.gyp:*',