Commit f9e001f4 authored by Erik Chen's avatar Erik Chen Committed by Commit Bot

Prevent downstream media targets from appearing in upstream chromium builds.

This CL adds a gn arg enable_downstream_media_tests, which downstream consumers
of chromium can set to make these builds appear. This prevents building and
isolate generation [which fails] in upstream chromium builds that try to
build/isolate all targets.

Bug: 876915
Change-Id: Ic0f892680e889a5cd5d92b8853800a3c08926a9b
Reviewed-on: https://chromium-review.googlesource.com/1186102Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585357}
parent 35738513
......@@ -2,6 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
declare_args() {
# Many of the targets defined in this file have dependencies that cannot be
# satisfied without additional downstream resources. Explicitly guard them
# them behind this flag so that we do not attempt to build or isolate targets
# in public chromium checkouts.
enable_downstream_media_tests = false
}
source_set("browser_tests") {
testonly = true
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
......@@ -66,17 +74,19 @@ copy("browser_test_resources") {
# Run separately from the Chromium waterfall with the external component
# extension. See README.md
group("media_router_e2e_tests") {
testonly = true
data_deps = [
":browser_test_resources",
":e2e_test_resources",
"//chrome/test:browser_tests",
]
data = [
"$root_out_dir/mr_extension/",
"internal/",
]
if (enable_downstream_media_tests) {
group("media_router_e2e_tests") {
testonly = true
data_deps = [
":browser_test_resources",
":e2e_test_resources",
"//chrome/test:browser_tests",
]
data = [
"$root_out_dir/mr_extension/",
"internal/",
]
}
}
copy("e2e_test_resources") {
......@@ -91,16 +101,18 @@ copy("e2e_test_resources") {
}
# Run separately. TODO: Documentation on how to run
group("swarming_tests") {
testonly = true
data_deps = [
":browser_test_resources",
"//chrome/test:browser_tests",
]
data = [
"internal/",
"$root_out_dir/mr_extension/",
]
if (enable_downstream_media_tests) {
group("swarming_tests") {
testonly = true
data_deps = [
":browser_test_resources",
"//chrome/test:browser_tests",
]
data = [
"internal/",
"$root_out_dir/mr_extension/",
]
}
}
source_set("test_support") {
......@@ -129,20 +141,22 @@ source_set("test_support") {
]
}
group("media_router_perf_tests") {
testonly = true
data = [
"$root_out_dir/media_router/telemetry_extension/",
"$root_out_dir/mr_extension/release/",
"internal/",
"telemetry/",
]
deps = [
"//tools/perf:perf",
]
data_deps = [
":telemetry_extension_resources",
]
if (enable_downstream_media_tests) {
group("media_router_perf_tests") {
testonly = true
data = [
"$root_out_dir/media_router/telemetry_extension/",
"$root_out_dir/mr_extension/release/",
"internal/",
"telemetry/",
]
deps = [
"//tools/perf:perf",
]
data_deps = [
":telemetry_extension_resources",
]
}
}
copy("telemetry_extension_resources") {
......
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