diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-13 11:07:01 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-13 11:07:01 +0000 |
| commit | 87e1f97b7bf06f8554aa27adae4357f81cff3e6b (patch) | |
| tree | 6c9832f9aec11787c70369fca1c308c4c2429944 /libjingle_tests.gyp | |
| parent | 4f4429782f46d028e2c18e29f382a04a726a4bb1 (diff) | |
| download | talk-87e1f97b7bf06f8554aa27adae4357f81cff3e6b.tar.gz | |
Revert r6110 and r6109.
Effectively re-landing r6104 as well as r6108 which includes a fix to a
compile error that caused r6104 to be reverted in r6110.
BUG=
TBR=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/20459004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6119 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'libjingle_tests.gyp')
| -rwxr-xr-x | libjingle_tests.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libjingle_tests.gyp b/libjingle_tests.gyp index f700261..d21c775 100755 --- a/libjingle_tests.gyp +++ b/libjingle_tests.gyp @@ -300,6 +300,7 @@ # TODO(ronghuawu): Reenable these tests. # 'media/devices/devicemanager_unittest.cc', 'media/webrtc/webrtcvideoengine_unittest.cc', + 'media/webrtc/webrtcvideoengine2_unittest.cc', 'media/webrtc/webrtcvoiceengine_unittest.cc', ], 'conditions': [ |