Commit 33ae9b1b authored by Tomas Popela's avatar Tomas Popela Committed by Commit Bot

Specify both paths for x_server_pixel_buffer.cc in cfi blacklist

This is needed because the WebRTC change is moving the files and the
lack of the new entry in the blacklist will cause a crash in
content_unittests's DesktopCaptureDeviceTest.Capture. See
https://bugs.chromium.org/p/chromium/issues/detail?id=901319#c14.

Bug: 901319
Change-Id: I547c663c42a315841415032a6d53141a051ad402
Reviewed-on: https://chromium-review.googlesource.com/c/1325801Reviewed-by: default avatarPatrik Höglund <phoglund@chromium.org>
Reviewed-by: default avatarMichael Moss <mmoss@chromium.org>
Reviewed-by: default avatarPeter Collingbourne <pcc@chromium.org>
Commit-Queue: Tomáš Popela <tomas.popela@gmail.com>
Cr-Commit-Position: refs/heads/master@{#607353}
parent bac3869c
...@@ -158,7 +158,10 @@ src:*ui/accessibility/platform/ax_platform_node_auralinux.cc ...@@ -158,7 +158,10 @@ src:*ui/accessibility/platform/ax_platform_node_auralinux.cc
src:*ui/accessibility/platform/ax_platform_atk_hyperlink.cc src:*ui/accessibility/platform/ax_platform_atk_hyperlink.cc
src:*chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc src:*chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
# Temporary needs both paths until the WebRTC changed is rolled in again
# see https://bugs.chromium.org/p/chromium/issues/detail?id=901319#c14
src:*third_party/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc src:*third_party/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc
src:*third_party/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc
src:*media/cdm/* src:*media/cdm/*
src:*third_party/swiftshader/* src:*third_party/swiftshader/*
src:*base/native_library_unittest.cc src:*base/native_library_unittest.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