Commit 88f639b4 authored by kjellander's avatar kjellander Committed by Commit bot

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}
parent 8f3aad07
...@@ -652,20 +652,14 @@ ...@@ -652,20 +652,14 @@
'target_name': 'chromium_builder_webrtc', 'target_name': 'chromium_builder_webrtc',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'chromium_builder_qa', # TODO(phoglund): not sure if needed? 'chromium_builder_perf',
'../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:browser_tests',
'../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests', '../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:frame_analyzer',
'../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', '../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_webrtc
{ {
'target_name': 'chromium_builder_chromedriver', 'target_name': 'chromium_builder_chromedriver',
...@@ -1147,7 +1141,7 @@ ...@@ -1147,7 +1141,7 @@
'dependencies': [ 'dependencies': [
'../base/base.gyp:base_unittests', '../base/base.gyp:base_unittests',
'../chrome/chrome.gyp:browser_tests', '../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:crash_service',
'../chrome/chrome.gyp:gcapi_dll', '../chrome/chrome.gyp:gcapi_dll',
'../chrome/chrome.gyp:pack_policy_templates', '../chrome/chrome.gyp:pack_policy_templates',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment