Commit f9fc0b7e authored by Kevin Marshall's avatar Kevin Marshall Committed by Commit Bot

Reland "[fuchsia] Exclude SwiftShader and Vulkan libs from CastRunner."

This is a reland of 54ad18ef

Removes the Vulkan validation library from the exclusion list,
since it is not reliably present across all build configurations.

Original change's description:
> [fuchsia] Exclude SwiftShader and Vulkan libs from CastRunner.
>
> Removes large libraries that were pulled in as a result of an indirect
> but necessary dep on Blink.
>
> The exclusions can be removed along with the Blink MessagePort
> dependency, once a fix for crbug.com/1126571 lands and is
> integrated with NamedMessagePortConnector.
>
> Bug: 1131102
> Bug: 1126571
> Change-Id: I7b25d50470d667f44424b925d3982efa268c24ae
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424512
> Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
> Reviewed-by: Fabrice de Gans-Riberi <fdegans@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#809544}

Bug: 1131102
Bug: 1126571
Change-Id: I3a464a21cd8b9f2c958d4243a01785ac39f7eaab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424990Reviewed-by: default avatarFabrice de Gans-Riberi <fdegans@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809876}
parent 15a1b419
...@@ -76,13 +76,17 @@ source_set("cast_runner_core") { ...@@ -76,13 +76,17 @@ source_set("cast_runner_core") {
"//base", "//base",
"//components/cast/named_message_port_connector:named_message_port_connector", "//components/cast/named_message_port_connector:named_message_port_connector",
"//fuchsia/base", "//fuchsia/base",
"//fuchsia/base:message_port",
"//fuchsia/base:modular", "//fuchsia/base:modular",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular", "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp", "//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp", "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//url", "//url",
] ]
# TODO(crbug.com/1131102): Remove dep when MessagePortProxy lands, and add assertions to ensure
# that Blink indirect deps don't creep back in.
deps += [ "//fuchsia/base:message_port" ]
public_deps = [ public_deps = [
":common", ":common",
"//fuchsia:cast_fidl", "//fuchsia:cast_fidl",
...@@ -100,8 +104,10 @@ executable("cast_runner_exe") { ...@@ -100,8 +104,10 @@ executable("cast_runner_exe") {
":common", ":common",
"//base", "//base",
"//fuchsia/base", "//fuchsia/base",
"//mojo/core/embedder", # TODO(crbug.com/1126571): Remove when MPP lands. "//mojo/core/embedder", # TODO(crbug.com/1126571): Remove when
# MessagePortProxy lands.
] ]
data_deps = [ ":cast_runner_core" ] data_deps = [ ":cast_runner_core" ]
visibility = [ ":*" ] visibility = [ ":*" ]
} }
...@@ -110,6 +116,18 @@ cr_fuchsia_package("cast_runner_pkg") { ...@@ -110,6 +116,18 @@ cr_fuchsia_package("cast_runner_pkg") {
binary = ":cast_runner_exe" binary = ":cast_runner_exe"
package_name_override = "cast_runner" package_name_override = "cast_runner"
manifest = "cast/cast_runner.cmx" manifest = "cast/cast_runner.cmx"
# TODO(crbug.com/1131102): Remove these exclusions when MessagePortProxy lands.
excluded_files = [
"lib/libEGL.so",
"lib/libfuchsia_egl.so",
"lib/libGLESv2.so",
"lib/libswiftshader_libEGL.so",
"lib/libswiftshader_libGLESv2.so",
"lib/libtrace-engine.so",
"lib/libvulkan.so",
"lib/VkLayer_image_pipe_swapchain.so",
]
} }
fuchsia_package_runner("cast_runner") { fuchsia_package_runner("cast_runner") {
...@@ -166,7 +184,8 @@ test("cast_runner_integration_tests") { ...@@ -166,7 +184,8 @@ test("cast_runner_integration_tests") {
"//base/test:run_all_unittests", "//base/test:run_all_unittests",
"//base/test:test_support", "//base/test:test_support",
"//fuchsia/base:test_support", "//fuchsia/base:test_support",
"//mojo/core/embedder", # TODO(crbug.com/1126571): Remove when MPP lands. "//mojo/core/embedder", # TODO(crbug.com/1126571): Remove when
# MessagePortProxy lands.
"//net:test_support", "//net:test_support",
"//testing/gtest", "//testing/gtest",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.camera3", "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.camera3",
......
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