0

[fuchsia] Clean up //media dependency into //fuchsia.

Remove no-longer-needed dependency from //media to
//fuchsia/engine:switches, and clean up the //fuchsia target visibility
rules to avoid regressions.

Bug: 1117629, 1120731, 1207695
Change-Id: I56ffcb6225df20c271cf2dcb1418f7b85a902a97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2973449
Auto-Submit: Wez <wez@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#894290}
This commit is contained in:
Wez
2021-06-21 17:31:32 +00:00
committed by Chromium LUCI CQ
parent 1dcebc1518
commit 175ff473bd
4 changed files with 10 additions and 16 deletions

@ -14,6 +14,7 @@ import("//tools/grit/repack.gni")
config("web_engine_implementation") {
defines = [ "WEB_ENGINE_IMPLEMENTATION" ]
visibility = [ ":*" ]
}
mojom("mojom") {
@ -27,13 +28,10 @@ mojom("mojom") {
}
fidl_library("fidl") {
visibility = [ ":web_engine_core" ]
library_name = "chromium.internal"
sources = [ "fidl/dev_tools.fidl" ]
public_deps = [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web" ]
visibility = [ ":*" ]
}
repack("web_engine_pak") {
@ -283,10 +281,7 @@ source_set("switches") {
visibility = [
":*",
"./*",
# TODO(crbug.com/1117629): Remove this when fixed.
"//media/renderers",
"web_instance_host",
]
}
@ -307,6 +302,7 @@ source_set("webui_resources") {
"$root_gen_dir/ui/resources/webui_resources.pak",
]
deps = [ "//ui/resources" ]
visibility = [ ":*" ]
}
_web_engine_excluded_files = [
@ -413,6 +409,10 @@ source_set("browsertest_core") {
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
"//ui/ozone",
]
visibility = [
":*",
"//fuchsia/runners:*",
]
}
test("web_engine_browsertests") {
@ -500,6 +500,8 @@ action("web_engine_unittests_fake_instance_manifest") {
"--program",
"web_engine_unittests__exec",
]
visibility = [ ":*" ]
}
test("web_engine_unittests") {

@ -59,10 +59,6 @@ source_set("renderers") {
"//ui/gl",
]
if (is_fuchsia) {
deps += [ "//fuchsia/engine:switches" ]
}
if (is_win) {
sources += [
"win/media_engine_extension.cc",

@ -2,7 +2,6 @@
include_rules = [
"+components/viz/client",
"+components/viz/common",
"+fuchsia/engine/switches.h",
"+media/base/audio_buffer.h",
"+media/base/bind_to_current_loop.h",
"+media/base/speech_recognition_client.h",

@ -23,9 +23,6 @@
#endif
#if defined(OS_FUCHSIA)
// TODO(crbug.com/1117629): Remove this dependency and update include_rules
// that allow it.
#include "fuchsia/engine/switches.h"
#include "media/filters/fuchsia/fuchsia_video_decoder.h"
#endif