webrtc/webrtc_tests.gypi - Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/webrtc_tests.gypi

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Resolved merge conflict Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: webrtc/webrtc_tests.gypi

diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi

index 238778bf1026a6bc4c0af1d3452d5bf51992e323..4b8a6d9af1297242e5e77cc471a99b75b69dd482 100644

--- a/webrtc/webrtc_tests.gypi

+++ b/webrtc/webrtc_tests.gypi

@@ -160,20 +160,20 @@

'call/packet_injection_tests.cc',

'test/common_unittest.cc',

'test/testsupport/metrics/video_metrics_unittest.cc',

- 'video/call_stats_unittest.cc',

- 'video/encoder_state_feedback_unittest.cc',

'video/end_to_end_tests.cc',

- 'video/overuse_frame_detector_unittest.cc',

- 'video/payload_router_unittest.cc',

- 'video/report_block_stats_unittest.cc',

'video/send_statistics_proxy_unittest.cc',

- 'video/stream_synchronization_unittest.cc',

'video/video_capture_input_unittest.cc',

'video/video_decoder_unittest.cc',

'video/video_encoder_unittest.cc',

'video/video_send_stream_tests.cc',

- 'video/vie_codec_unittest.cc',

- 'video/vie_remb_unittest.cc',

+ 'video_engine/call_stats_unittest.cc',

+ 'video_engine/encoder_state_feedback_unittest.cc',

+ 'video_engine/overuse_frame_detector_unittest.cc',

+ 'video_engine/payload_router_unittest.cc',

+ 'video_engine/report_block_stats_unittest.cc',

+ 'video_engine/stream_synchronization_unittest.cc',

+ 'video_engine/vie_codec_unittest.cc',

+ 'video_engine/vie_remb_unittest.cc',

'dependencies': [

'<(DEPTH)/testing/gmock.gyp:gmock',

« no previous file with comments | « webrtc/video_renderer.h ('k') | no next file » | no next file with comments »