diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-03 13:32:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-01 14:31:55 +0200 |
| commit | 21ba0c5d4bf8fba15dddd97cd693bad2358b77fd (patch) | |
| tree | 91be119f694044dfc1ff9fdc054459e925de9df0 /chromium/third_party/wayland | |
| parent | 03c549e0392f92c02536d3f86d5e1d8dfa3435ac (diff) | |
| download | qtwebengine-chromium-21ba0c5d4bf8fba15dddd97cd693bad2358b77fd.tar.gz | |
BASELINE: Update Chromium to 92.0.4515.166
Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364
Diffstat (limited to 'chromium/third_party/wayland')
| -rw-r--r-- | chromium/third_party/wayland/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/third_party/wayland/features.gni | 2 | ||||
| -rw-r--r-- | chromium/third_party/wayland/wayland_protocol.gni | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chromium/third_party/wayland/BUILD.gn b/chromium/third_party/wayland/BUILD.gn index cef3d7d2db7..e5802b5ca38 100644 --- a/chromium/third_party/wayland/BUILD.gn +++ b/chromium/third_party/wayland/BUILD.gn @@ -11,6 +11,8 @@ if (!use_system_libwayland) { "include", "include/src", "include/protocol", + "src/cursor", + "src/egl", "src/src", ] diff --git a/chromium/third_party/wayland/features.gni b/chromium/third_party/wayland/features.gni index ecdc2c72ff2..424be6e75be 100644 --- a/chromium/third_party/wayland/features.gni +++ b/chromium/third_party/wayland/features.gni @@ -18,5 +18,5 @@ declare_args() { # This may be set by Chromium packagers who do not wish to use the bundled # wayland scanner. - use_system_wayland_scanner = (host_toolchain == default_toolchain && is_msan) + use_system_wayland_scanner = host_toolchain == default_toolchain && is_msan } diff --git a/chromium/third_party/wayland/wayland_protocol.gni b/chromium/third_party/wayland/wayland_protocol.gni index e7a90c07b6f..080996f2d1f 100644 --- a/chromium/third_party/wayland/wayland_protocol.gni +++ b/chromium/third_party/wayland/wayland_protocol.gni @@ -9,7 +9,6 @@ # sources = [ "foo.xml" ] # } -import("//build/config/python.gni") import("//third_party/wayland/features.gni") template("wayland_protocol") { @@ -34,8 +33,7 @@ template("wayland_protocol") { source_set_name = "${target_name}" # Action which runs wayland-scanner to generate the code. - # TODO(crbug.com/1112471): Get this to run cleanly under Python 3. - python2_action(action_name) { + action(action_name) { visibility = [ ":$source_set_name" ] script = "//third_party/wayland/wayland_scanner_wrapper.py" sources = invoker.sources |