Commit e865a56b authored by Miguel Casas's avatar Miguel Casas Committed by Commit Bot

Do not use components/arc/common in non CrOs builds

I found that (at least win) bots are using components/arc/common
stuff (see e.g. [1]), when this are supposed to be limited to
CrOs.  This CL corrects that by sandwiching the appropriate
BUILD entries between if(is_chromeos).

[1] https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8936282730877054816/+/steps/compile/0/stdout
/BUILD.gn mojom(media)

Bug: 732531
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: Ic0e807b5b97d1aadd5736377188456634424647d
Reviewed-on: https://chromium-review.googlesource.com/1208410Reviewed-by: default avatarLuis Hector Chavez <lhchavez@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarkylechar <kylechar@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589056}
parent f95e38e4
...@@ -81,22 +81,23 @@ if (is_chromeos) { ...@@ -81,22 +81,23 @@ if (is_chromeos) {
":media", # for gfx.mojom ":media", # for gfx.mojom
] ]
} }
}
# Media related mojo interfaces. There are used by //services/ws/public/mojom. # Media related mojo interfaces. There are used by //services/ws/public/mojom.
# We have this separate mojom target to avoid pulling in unnecessary interfaces. # We have this separate mojom target to avoid pulling in unnecessary
mojom("media") { # interfaces.
sources = [ mojom("media") {
"gfx.mojom", sources = [
"protected_buffer_manager.mojom", "gfx.mojom",
"video.mojom", "protected_buffer_manager.mojom",
"video_common.mojom", "video.mojom",
"video_decode_accelerator.mojom", "video_common.mojom",
"video_encode_accelerator.mojom", "video_decode_accelerator.mojom",
"video_protected_buffer_allocator.mojom", "video_encode_accelerator.mojom",
] "video_protected_buffer_allocator.mojom",
]
public_deps = [ public_deps = [
"//ui/gfx/geometry/mojo", "//ui/gfx/geometry/mojo",
] ]
}
} }
...@@ -12,11 +12,13 @@ mojom("gl") { ...@@ -12,11 +12,13 @@ mojom("gl") {
] ]
public_deps = [ public_deps = [
"//components/arc/common:media",
"//gpu/ipc/common:interfaces", "//gpu/ipc/common:interfaces",
"//media/mojo/interfaces", "//media/mojo/interfaces",
"//ui/gfx/geometry/mojo", "//ui/gfx/geometry/mojo",
"//ui/gfx/mojo", "//ui/gfx/mojo",
"//url/mojom:url_mojom_gurl", "//url/mojom:url_mojom_gurl",
] ]
if (is_chromeos) {
public_deps += [ "//components/arc/common:media" ]
}
} }
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