Commit ec12065e authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

ozone/wayland: fix build with system libwayland.

It's incorrect to include wayland-server-protocol-core.h file,
instead, one must include wayland-server-protocol.h.

This fix fixes that and unblocks building with
use_system_libwayland=true.

TBR=rjkroege@chromium.org

Test: build with use_system_libwayland=true
Bug: 1022750
Change-Id: Ie113b47992a9e50426a0e361498f12ec6d4d3de7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153162Reviewed-by: default avatarMaksim Sisov <msisov@igalia.com>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#760433}
parent 36e66bca
......@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
#include "base/macros.h"
#include "testing/gmock/include/gmock/gmock.h"
......
......@@ -5,7 +5,7 @@
#ifndef UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_DATA_DEVICE_H_
#define UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_DATA_DEVICE_H_
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
#include "base/macros.h"
#include "ui/ozone/platform/wayland/test/server_object.h"
......
......@@ -5,7 +5,7 @@
#ifndef UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_DATA_DEVICE_MANAGER_H_
#define UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_DATA_DEVICE_MANAGER_H_
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
#include "base/macros.h"
#include "ui/ozone/platform/wayland/test/global_object.h"
......
......@@ -8,7 +8,7 @@
#include <memory>
#include <string>
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
#include "base/files/scoped_file.h"
#include "base/macros.h"
......
......@@ -5,7 +5,7 @@
#ifndef UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_DATA_SOURCE_H_
#define UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_DATA_SOURCE_H_
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
#include <memory>
#include <string>
......
......@@ -4,7 +4,7 @@
#include "ui/ozone/platform/wayland/test/test_output.h"
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
namespace wl {
......
......@@ -5,7 +5,7 @@
#ifndef UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_REGION_H_
#define UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_REGION_H_
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
#include "third_party/skia/include/core/SkRegion.h"
......
......@@ -5,7 +5,7 @@
#ifndef UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_SEAT_H_
#define UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_SEAT_H_
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
#include "base/macros.h"
#include "ui/ozone/platform/wayland/test/global_object.h"
......
......@@ -5,7 +5,7 @@
#ifndef UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_SUBSURFACE_H_
#define UI_OZONE_PLATFORM_WAYLAND_TEST_TEST_SUBSURFACE_H_
#include <wayland-server-protocol-core.h>
#include <wayland-server-protocol.h>
#include <memory>
#include <utility>
......
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