0

Move ui/ozone/ozone/gni to build/config/ozone/gni

This CL moves ui/ozone/ozone.gni to build/config/ui.gni because a few
args in ui/ozone/ozone.gni will be used by toolchain files under
build/, and the reason is that in a LaCrOS build, ozone_platform is set
to use Wayland, and meanwhile, we build an ash-chrome in an alternate
toolchain, which requires re-setting the ozone_platform back to empty.
For more details, please see:
https://chromium-review.googlesource.com/c/chromium/src/+/2416999

Bug: 1129223
Change-Id: I8c1e94c568165de2a5c26ca103fa84a60eb68b21
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427423
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: Michael Spang <spang@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#814006}
This commit is contained in:
Yuke Liao
2020-10-06 00:20:59 +00:00
committed by Commit Bot
parent 51294a2a2d
commit 7356d7f3b5
27 changed files with 146 additions and 137 deletions
build/config
chrome/browser/ui
components/exo/wayland
content/shell
gpu/vulkan
ui
base
chromeos
events
events
BUILD.gn
devices
keycodes
platform
gfx
gl
gtk
ozone
platform_window
views

@ -2,3 +2,4 @@ dpranke@google.com
scottmg@chromium.org
per-file *jumbo*=bratell.d@gmail.com
per-file ozone.gni=file://ui/ozone/OWNERS

116
build/config/ozone.gni Normal file

@ -0,0 +1,116 @@
# Copyright 2020 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromecast_build.gni")
import("//build/config/ui.gni")
import("//build/toolchain/toolchain.gni")
declare_args() {
# Ozone extra platforms file path. Can be overridden to build out of
# tree ozone platforms.
ozone_extra_path = "//ui/ozone/ozone_extra.gni"
# Select platforms automatically. Turn this off for manual control.
ozone_auto_platforms = use_ozone
# TODO(petermcneeley): Backwards compatiblity support for VM images.
# Remove when deprecated. (https://crbug.com/1122009)
ozone_platform_gbm = -1
}
declare_args() {
# The platform that will used at runtime by default. This can be overridden
# with the command line flag --ozone-platform=<platform>.
ozone_platform = ""
# Compile the 'cast' platform.
ozone_platform_cast = false
# Compile the 'drm' platform.
ozone_platform_drm = false
# Compile the 'headless' platform.
ozone_platform_headless = false
# Compile the 'scenic' platform.
ozone_platform_scenic = false
# Compile the 'x11' platform.
ozone_platform_x11 = false
# Compile the 'wayland' platform.
ozone_platform_wayland = false
# Compile the 'windows' platform.
ozone_platform_windows = false
if (ozone_auto_platforms) {
# Use headless as the default platform unless modified below.
ozone_platform = "headless"
ozone_platform_headless = true
if (is_cast_audio_only) {
# Just use headless for audio-only Cast platforms.
} else if (is_chromecast && !is_fuchsia) {
# Enable the Cast ozone platform on all A/V Cast builds except Fuchsia.
ozone_platform_cast = true
# For visual desktop Chromecast builds, override the default "headless"
# platform with --ozone-platform=x11.
# TODO(halliwell): Create a libcast_graphics implementation for desktop
# using X11, and disable this platform.
if (is_cast_desktop_build && !is_cast_audio_only) {
ozone_platform_x11 = true
} else {
ozone_platform = "cast"
}
} else if (is_chromeos) {
ozone_platform = "x11"
ozone_platform_drm = true
ozone_platform_x11 = true
} else if (is_linux) {
ozone_platform = "x11"
ozone_platform_wayland = true
ozone_platform_x11 = true
} else if (is_win) {
ozone_platform = "windows"
ozone_platform_windows = true
} else if (is_fuchsia) {
ozone_platform = "scenic"
ozone_platform_scenic = true
}
}
# TODO(petermcneeley): Backwards compatiblity support for VM images.
# Remove when deprecated. (https://crbug.com/1122009)
if (ozone_platform_gbm != -1) {
ozone_platform_drm = ozone_platform_gbm
}
}
import(ozone_extra_path)
_ozone_extra_directory = get_path_info(ozone_extra_path, "dir")
# Extra paths to add to targets visibility list.
ozone_external_platform_visibility = [ "$_ozone_extra_directory/*" ]
if (is_a_target_toolchain) {
assert(use_ozone || !(ozone_platform_cast || ozone_platform_drm ||
ozone_platform_headless || ozone_platform_x11 ||
ozone_platform_wayland || ozone_platform_windows ||
ozone_platform_scenic),
"Must set use_ozone to select ozone platforms")
}
# TODO(petermcneeley): Backwards compatiblity support for VM images.
# Remove when deprecated. (https://crbug.com/1122009)
assert(ozone_platform_gbm == -1 || ozone_platform_drm == ozone_platform_gbm)
ozone_platform_gbm = ozone_platform_drm
if (ozone_platform == "gbm") {
ozone_platform = "drm"
}

@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
import("//build/config/crypto.gni")
import("//build/config/features.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
@ -25,7 +26,6 @@ import("//printing/buildflags/buildflags.gni")
import("//rlz/buildflags/buildflags.gni")
import("//third_party/protobuf/proto_library.gni")
import("//ui/base/ui_features.gni")
import("//ui/ozone/ozone.gni")
import("//ui/views/features.gni")
# Use a static library here because many test binaries depend on this but don't

@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//gpu/vulkan/features.gni")
import("//testing/test.gni")
import("//ui/base/ui_features.gni")
import("//ui/ozone/ozone.gni")
source_set("wayland") {
sources = [

@ -5,6 +5,7 @@
import("//build/config/chromecast_build.gni")
import("//build/config/features.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/ozone.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//build/config/win/console_app.gni")
@ -16,7 +17,6 @@ import("//ppapi/buildflags/buildflags.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni")
import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
import("//ui/ozone/ozone.gni")
if (is_android) {
import("//build/config/android/config.gni")
} else if (is_mac) {

@ -4,9 +4,9 @@
import("//build/buildflag_header.gni")
import("//build/config/dcheck_always_on.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
import("//ui/ozone/ozone.gni")
import("features.gni")
# Generate a buildflag header for compile-time checking of Vulkan support.

@ -7,6 +7,7 @@ import("//build/config/compiler/compiler.gni")
import("//build/config/dcheck_always_on.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/linux/pangocairo/pangocairo.gni")
import("//build/config/ozone.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/ui.gni")
import("//build/util/branding.gni")
@ -14,7 +15,6 @@ import("//components/system_media_controls/linux/buildflags/buildflags.gni")
import("//testing/test.gni")
import("//tools/grit/grit_rule.gni")
import("//ui/base/ui_features.gni")
import("//ui/ozone/ozone.gni")
if (is_android) {
import("//build/config/android/config.gni")

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("///ui/ozone/ozone.gni")
import("///build/config/ozone.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/ui.gni")

@ -3,8 +3,8 @@
# found in the LICENSE file.
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
assert(use_x11 || ozone_platform_x11)

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
assert(is_chromeos)

@ -3,10 +3,10 @@
# found in the LICENSE file.
import("//build/config/features.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
import("//ui/base/ui_features.gni")
import("//ui/ozone/ozone.gni")
if (is_android) {
import("//build/config/android/rules.gni")

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
assert(use_x11 || ozone_platform_x11)

@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/base/ui_features.gni")
import("//ui/ozone/ozone.gni")
source_set("xkb") {
sources = [

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
assert(use_x11 || ozone_platform_x11)

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
assert(use_x11 || ozone_platform_drm || ozone_platform_wayland)

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
assert(use_x11 || ozone_platform_x11)

@ -6,10 +6,10 @@ import("//build/buildflag_header.gni")
import("//build/config/chrome_build.gni")
import("//build/config/chromecast_build.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
import("//ui/gl/features.gni")
import("//ui/ozone/ozone.gni")
declare_args() {
# Whether service side logging (actual calls into the GL driver) is enabled

@ -6,9 +6,9 @@ assert(is_linux || is_chromeos, "This file should only be referenced on Linux")
import("//build/config/features.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//printing/buildflags/buildflags.gni")
import("//ui/ozone/ozone.gni")
component("gtk_ui_delegate") {
public = [ "gtk_ui_delegate.h" ]

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
assert(use_x11 || ozone_platform_x11)

@ -3,10 +3,10 @@
# found in the LICENSE file.
import("//build/buildflag_header.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//gpu/vulkan/features.gni")
import("//testing/test.gni")
import("//ui/ozone/ozone.gni")
assert(use_ozone)

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
assert(use_ozone)

@ -2,115 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromecast_build.gni")
import("//build/config/ui.gni")
import("//build/toolchain/toolchain.gni")
declare_args() {
# Ozone extra platforms file path. Can be overridden to build out of
# tree ozone platforms.
ozone_extra_path = "//ui/ozone/ozone_extra.gni"
# Select platforms automatically. Turn this off for manual control.
ozone_auto_platforms = use_ozone
# TODO(petermcneeley): Backwards compatiblity support for VM images.
# Remove when deprecated. (https://crbug.com/1122009)
ozone_platform_gbm = -1
}
declare_args() {
# The platform that will used at runtime by default. This can be overridden
# with the command line flag --ozone-platform=<platform>.
ozone_platform = ""
# Compile the 'cast' platform.
ozone_platform_cast = false
# Compile the 'drm' platform.
ozone_platform_drm = false
# Compile the 'headless' platform.
ozone_platform_headless = false
# Compile the 'scenic' platform.
ozone_platform_scenic = false
# Compile the 'x11' platform.
ozone_platform_x11 = false
# Compile the 'wayland' platform.
ozone_platform_wayland = false
# Compile the 'windows' platform.
ozone_platform_windows = false
if (ozone_auto_platforms) {
# Use headless as the default platform unless modified below.
ozone_platform = "headless"
ozone_platform_headless = true
if (is_cast_audio_only) {
# Just use headless for audio-only Cast platforms.
} else if (is_chromecast && !is_fuchsia) {
# Enable the Cast ozone platform on all A/V Cast builds except Fuchsia.
ozone_platform_cast = true
# For visual desktop Chromecast builds, override the default "headless"
# platform with --ozone-platform=x11.
# TODO(halliwell): Create a libcast_graphics implementation for desktop
# using X11, and disable this platform.
if (is_cast_desktop_build && !is_cast_audio_only) {
ozone_platform_x11 = true
} else {
ozone_platform = "cast"
}
} else if (is_chromeos) {
ozone_platform = "x11"
ozone_platform_drm = true
ozone_platform_x11 = true
} else if (is_linux) {
ozone_platform = "x11"
ozone_platform_wayland = true
ozone_platform_x11 = true
} else if (is_win) {
ozone_platform = "windows"
ozone_platform_windows = true
} else if (is_fuchsia) {
ozone_platform = "scenic"
ozone_platform_scenic = true
}
}
# TODO(petermcneeley): Backwards compatiblity support for VM images.
# Remove when deprecated. (https://crbug.com/1122009)
if (ozone_platform_gbm != -1) {
ozone_platform_drm = ozone_platform_gbm
}
}
import(ozone_extra_path)
_ozone_extra_directory = get_path_info(ozone_extra_path, "dir")
# Extra paths to add to targets visibility list.
ozone_external_platform_visibility = [ "$_ozone_extra_directory/*" ]
if (is_a_target_toolchain) {
assert(use_ozone || !(ozone_platform_cast || ozone_platform_drm ||
ozone_platform_headless || ozone_platform_x11 ||
ozone_platform_wayland || ozone_platform_windows ||
ozone_platform_scenic),
"Must set use_ozone to select ozone platforms")
}
# TODO(petermcneeley): Backwards compatiblity support for VM images.
# Remove when deprecated. (https://crbug.com/1122009)
assert(ozone_platform_gbm == -1 || ozone_platform_drm == ozone_platform_gbm)
ozone_platform_gbm = ozone_platform_drm
if (ozone_platform == "gbm") {
ozone_platform = "drm"
}
import("//build/config/ozone.gni")
# TODO(crbug.com/1129223): Remove this place holder once Angle project stops
# referencing to this file.
# https://source.chromium.org/chromium/chromium/src/+/master:third_party/angle/gni/angle.gni;l=43;drc=2d74170f899b91793bd7967184b4d7d216a3e9ec

@ -3,11 +3,11 @@
# found in the LICENSE file.
import("//build/config/chromecast_build.gni")
import("//ui/ozone/ozone.gni")
import("//build/config/ozone.gni")
visibility = [
"//ui/ozone/*",
"//chromecast/*",
"//ui/ozone/*",
]
# TODO(slan): gn check needs deps on ozone and media to pass. Correct this.

@ -4,8 +4,8 @@
import("//build/config/chromecast_build.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ozone.gni")
import("//gpu/vulkan/features.gni")
import("//ui/ozone/ozone.gni")
visibility = [ "//ui/ozone/*" ]

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/ozone/ozone.gni")
declare_args() {
# Checks if Wayland must be compiled with dmabuf/gbm feature, which allows a

@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
import("//ui/ozone/ozone.gni")
assert(use_x11 || ozone_platform_x11)

@ -4,11 +4,11 @@
import("//build/buildflag_header.gni")
import("//build/config/features.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//components/vector_icons/vector_icons.gni")
import("//testing/test.gni")
import("//ui/base/ui_features.gni")
import("//ui/ozone/ozone.gni")
import("//ui/views/features.gni")
assert(toolkit_views)