zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-land "Remove <(webrtc_root) from source file entries."

Browse Source 
Changes differing from https://webrtc-codereview.appspot.com/37859004:
* I put the include_tests==1 stuff of audio_coding.gypi in its
  own audio_coding_tests.gypi file, including the Android and isolate
  targets which were incorrectly located in the previous CL
* I moved the bwe utilities in remote_bitrate_estimator.gypi
  into include_tests==1 since they depend on test.gyp after I
  cleaned up the duplicated inclusion of rtp_file_reader.cc

R=stefan@webrtc.org
TBR=tina.legrand@webrtc.org
TESTED=Passing gyp and compile using:
webrtc/build/gyp_webrtc -Dinclude_tests=1
webrtc/build/gyp_webrtc -Dinclude_tests=0
I also setup a Chromium checkout with my checkout mounted in
third_party/webrtc and ran build/gyp_chromium successfully.

BUG=4185

Review URL: https://webrtc-codereview.appspot.com/33159004

Cr-Commit-Position: refs/heads/master@{#8205}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8205 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
2015-01-29 14:29:45 +00:00
parent bdebccf384
commit a33f05e8d7
19 changed files with 201 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/webrtc_tests.gypi
View File

@ -96,13 +96,13 @@
'target_name': 'video_engine_tests',
'type': '<(gtest_target_type)',
'sources': [
'modules/audio_processing/agc/test/agc_manager_unittest.cc',
'test/common_unittest.cc',
'test/testsupport/metrics/video_metrics_unittest.cc',
'tools/agc/agc_manager_unittest.cc',
'video/bitrate_estimator_tests.cc',
'video/end_to_end_tests.cc',
'video/send_statistics_proxy_unittest.cc',
'video/video_send_stream_tests.cc',
'test/common_unittest.cc',
'test/testsupport/metrics/video_metrics_unittest.cc',
],
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
@ -131,7 +131,7 @@
'type': '<(gtest_target_type)',
'sources': [
'modules/audio_coding/neteq/test/neteq_performance_unittest.cc',
'modules/audio_processing/agc/test/agc_manager_integrationtest.cc',
'tools/agc/agc_manager_integrationtest.cc',
'video/call_perf_tests.cc',
'video/full_stack.cc',
'video/rampup_tests.cc',