summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-20 11:15:33 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-03 16:01:53 +0200
commit679cebe92cda408ff135f8748baf2d73e05d0399 (patch)
tree55f1fe1a9802bc4ee1c17162484f030cf279e878
parent14bd91022a0518565ed05f7a2ffff9c99a39e430 (diff)
downloadqtwebengine-chromium-679cebe92cda408ff135f8748baf2d73e05d0399.tar.gz
Support external ozone platforms
Add option to add external ozone platform. Assumes the external ozone platform is also set as the default ozone platform. Change-Id: I683b56828f9adbc920fcfc3f63aa3ab8b78a6084 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/ui/ozone/BUILD.gn4
-rw-r--r--chromium/ui/ozone/ozone.gni3
2 files changed, 6 insertions, 1 deletions
diff --git a/chromium/ui/ozone/BUILD.gn b/chromium/ui/ozone/BUILD.gn
index b5746becf55..0b75cddf5ac 100644
--- a/chromium/ui/ozone/BUILD.gn
+++ b/chromium/ui/ozone/BUILD.gn
@@ -47,6 +47,10 @@ if (ozone_platform_x11) {
ozone_platform_deps += [ "platform/x11" ]
}
+if (ozone_platform_external) {
+ ozone_platforms += [ ozone_platform ]
+}
+
platform_list_cc_file = "$target_gen_dir/platform_list.cc"
platform_list_h_file = "$target_gen_dir/platform_list.h"
platform_list_txt_file = "$target_gen_dir/platform_list.txt"
diff --git a/chromium/ui/ozone/ozone.gni b/chromium/ui/ozone/ozone.gni
index b677b48cf98..3636f0cc468 100644
--- a/chromium/ui/ozone/ozone.gni
+++ b/chromium/ui/ozone/ozone.gni
@@ -27,6 +27,7 @@ declare_args() {
ozone_platform_headless = false
ozone_platform_x11 = false
ozone_platform_wayland = false
+ ozone_platform_external = false
if (ozone_auto_platforms) {
# Use headless as the default platform.
@@ -61,5 +62,5 @@ declare_args() {
assert(use_ozone || !(ozone_platform_cast || ozone_platform_gbm ||
ozone_platform_headless || ozone_platform_x11 ||
- ozone_platform_wayland),
+ ozone_platform_wayland || ozone_platform_external),
"Must set use_ozone to select ozone platforms")