Commit 9b65c69b authored by Penny MacNeil's avatar Penny MacNeil Committed by Commit Bot

[ui/display] Change component name on Windows.

"display.dll" is a Windows system dll.  This causes a clash in debug component builds.
Change the GN output_name for the display component to "ui_display".

Ref: crbug/818388

Test: chromium.gpu waterfall bot (debug component), or chromium.gpu.fyi.
Change-Id: Ibdb41cb6841708c61893a0e05d00f5af17b583cd
Reviewed-on: https://chromium-review.googlesource.com/1152099Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Commit-Queue: Penny MacNeil <pennymac@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578865}
parent 84424c67
...@@ -64,6 +64,11 @@ component("display") { ...@@ -64,6 +64,11 @@ component("display") {
"//ui/gfx/geometry", "//ui/gfx/geometry",
] ]
if (is_win) {
# Don't conflict with Windows' "display.dll".
output_name = "ui_display"
}
if (!use_aura) { if (!use_aura) {
sources -= [ "screen_aura.cc" ] sources -= [ "screen_aura.cc" ]
} }
......
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