summaryrefslogtreecommitdiff
path: root/webrtc.gyp
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-09-11 17:39:37 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-09-11 17:39:37 +0000
commit8f88adf74ee77ddc03c123898e1b0790f67aa4cd (patch)
tree31715df304ebcc71ae6fae857e682d40b9daa1ae /webrtc.gyp
parent037d14dba23a47e64df0cb621e2c68dba386fb8e (diff)
parent61576f53599cf7840d3c4ebab82802b90031adcd (diff)
downloadwebrtc-8f88adf74ee77ddc03c123898e1b0790f67aa4cd.tar.gz
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 61576f53599cf7840d3c4ebab82802b90031adcd
This commit was generated by merge_from_chromium.py. Change-Id: Ia64db11ba8bae14d075c94b5ec153e6c1bea9589
Diffstat (limited to 'webrtc.gyp')
-rw-r--r--webrtc.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc.gyp b/webrtc.gyp
index 12d38dba..b17077bd 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -43,7 +43,6 @@
'conditions': [
['include_tests==1', {
'dependencies': [
- 'base/base_tests.gyp:*',
'common_video/common_video_unittests.gyp:*',
'libjingle/xmllite/xmllite_tests.gyp:*',
'sound/sound_tests.gyp:*',
@@ -53,6 +52,7 @@
'test/webrtc_test_common.gyp:webrtc_test_common_unittests',
'tools/tools.gyp:*',
'webrtc_tests',
+ 'rtc_unittests',
],
}],
],