diff options
| author | kjellander <kjellander@chromium.org> | 2014-09-22 07:32:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-22 14:33:05 +0000 |
| commit | 88f639b44ae2bb400ce3407c127ed57565662ef0 (patch) | |
| tree | 3d607b2116404a634fc932876c7666214d642c46 /build | |
| parent | 8f3aad074241dd60f5a8b6796866ec1272ea3877 (diff) | |
| download | chromium_src-88f639b44ae2bb400ce3407c127ed57565662ef0.zip chromium_src-88f639b44ae2bb400ce3407c127ed57565662ef0.tar.gz chromium_src-88f639b44ae2bb400ce3407c127ed57565662ef0.tar.bz2 | |
Add media_unittests to chromium_builder_webrtc GYP target.
Also depend on chromium_builder_perf instead of chromium_builder_qa
since it's likely we'll start running Telemetry tests on our bots
in the near future.
BUG=
Review URL: https://codereview.chromium.org/587173004
Cr-Commit-Position: refs/heads/master@{#295968}
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/build/all.gyp b/build/all.gyp index ce83a51..f31e400 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -652,20 +652,14 @@ 'target_name': 'chromium_builder_webrtc', 'type': 'none', 'dependencies': [ - 'chromium_builder_qa', # TODO(phoglund): not sure if needed? + 'chromium_builder_perf', '../chrome/chrome.gyp:browser_tests', '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_unittests', + '../media/media.gyp:media_unittests', '../third_party/webrtc/tools/tools.gyp:frame_analyzer', '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', ], - 'conditions': [ - ['OS=="win"', { - 'dependencies': [ - '../chrome/chrome.gyp:crash_service', - ], - }], - ], }, # target_name: chromium_builder_webrtc { 'target_name': 'chromium_builder_chromedriver', @@ -1147,7 +1141,7 @@ 'dependencies': [ '../base/base.gyp:base_unittests', '../chrome/chrome.gyp:browser_tests', - '../chrome/chrome.gyp:sync_integration_tests', + '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:crash_service', '../chrome/chrome.gyp:gcapi_dll', '../chrome/chrome.gyp:pack_policy_templates', |