0

events: ozone: Move layout target to a separate file

Clean up the build files by moving targets closer to the code they
contain.

Bug: 1026406
TBR=afakhry@chromium.org,dnicoara@chromium.org

Change-Id: If17ea7a5c04b244c349e08e30f1d68273712c821
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1925669
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Kevin Schoedel <kpschoedel@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717071}
This commit is contained in:
Michael Spang
2019-11-20 17:53:22 +00:00
committed by Commit Bot
parent 6218b2018a
commit db8b5d828d
15 changed files with 70 additions and 64 deletions
ash/components/shortcut_viewer
chrome
browser
vr
testapp
test
chromedriver
components/exo/wayland
ui
base
events
ozone
demo
platform
cast
drm
headless
scenic
wayland
windows

@ -36,7 +36,7 @@ source_set("shortcut_viewer") {
"//ui/chromeos/search_box",
"//ui/events:events_base",
"//ui/events/devices",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/views",
]
}

@ -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/util/process_version.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni")
import("//build/util/process_version.gni")
executable("vr_testapp") {
testonly = true
@ -36,7 +36,7 @@ executable("vr_testapp") {
"//ui/display/types",
"//ui/events",
"//ui/events:dom_keycode_converter",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/gl/init",
"//ui/ozone",
"//ui/platform_window",

@ -299,7 +299,7 @@ source_set("lib") {
"//ui/base",
"//ui/events:dom_keycode_converter",
"//ui/events:events_base",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/gfx",
"//ui/gfx/geometry",
]

@ -161,7 +161,7 @@ source_set("wayland") {
if (is_chromeos) {
deps += [
"//ash/public/cpp",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
]
}
}

@ -580,7 +580,7 @@ jumbo_component("base") {
]
deps += [
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/ozone:ozone_base",
]

@ -91,7 +91,7 @@ static_library("dom_keyboard_layout") {
":dom_keycode_converter",
":events_base",
"//base",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
]
if (!is_ios) {
@ -306,7 +306,7 @@ jumbo_component("events") {
"ozone/events_ozone.cc",
"ozone/keyboard_hook_ozone.cc",
]
deps += [ "//ui/events/ozone:events_ozone_layout" ]
deps += [ "//ui/events/ozone/layout" ]
}
if (use_aura) {
@ -651,7 +651,7 @@ if (!is_ios) {
deps += [
"//ui/events/ozone:events_ozone",
"//ui/events/ozone:events_ozone_evdev",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
]
}

@ -3,21 +3,13 @@
# found in the LICENSE file.
import("//build/config/features.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni")
import("//ui/base/ui_features.gni")
declare_args() {
# Support ChromeOS touchpad gestures with ozone.
use_evdev_gestures = false
}
if (use_xkbcommon) {
pkg_config("xkbcommon") {
packages = [ "xkbcommon" ]
}
}
if (use_ozone) {
component("events_ozone") {
sources = [
@ -153,13 +145,13 @@ if (use_ozone) {
deps = [
":events_ozone",
":events_ozone_layout",
"//base",
"//ui/display",
"//ui/events",
"//ui/events:dom_keycode_converter",
"//ui/events:events_base",
"//ui/events/devices",
"//ui/events/ozone/layout",
"//ui/events/platform",
"//ui/gfx",
"//ui/ozone:ozone_base",
@ -196,38 +188,3 @@ if (use_ozone) {
}
}
}
component("events_ozone_layout") {
sources = [
"layout/events_ozone_layout_export.h",
"layout/keyboard_layout_engine.h",
"layout/keyboard_layout_engine_manager.cc",
"layout/keyboard_layout_engine_manager.h",
"layout/no/no_keyboard_layout_engine.cc",
"layout/no/no_keyboard_layout_engine.h",
"layout/stub/stub_keyboard_layout_engine.cc",
"layout/stub/stub_keyboard_layout_engine.h",
]
defines = [ "EVENTS_OZONE_LAYOUT_IMPLEMENTATION" ]
deps = [
"//base",
"//ui/events:dom_keycode_converter",
"//ui/events:events_base",
]
if (use_xkbcommon) {
configs += [ ":xkbcommon" ]
sources += [
"layout/xkb/xkb_evdev_codes.cc",
"layout/xkb/xkb_evdev_codes.h",
"layout/xkb/xkb_key_code_converter.h",
"layout/xkb/xkb_keyboard_layout_engine.cc",
"layout/xkb/xkb_keyboard_layout_engine.h",
]
deps += [ "//ui/events/keycodes:xkb" ]
}
}

@ -0,0 +1,49 @@
# Copyright 2019 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/linux/pkg_config.gni")
import("//ui/base/ui_features.gni")
if (use_xkbcommon) {
pkg_config("xkbcommon") {
packages = [ "xkbcommon" ]
}
}
component("layout") {
output_name = "events_ozone_layout"
sources = [
"events_ozone_layout_export.h",
"keyboard_layout_engine.h",
"keyboard_layout_engine_manager.cc",
"keyboard_layout_engine_manager.h",
"no/no_keyboard_layout_engine.cc",
"no/no_keyboard_layout_engine.h",
"stub/stub_keyboard_layout_engine.cc",
"stub/stub_keyboard_layout_engine.h",
]
defines = [ "EVENTS_OZONE_LAYOUT_IMPLEMENTATION" ]
deps = [
"//base",
"//ui/events:dom_keycode_converter",
"//ui/events:events_base",
]
if (use_xkbcommon) {
configs += [ ":xkbcommon" ]
sources += [
"xkb/xkb_evdev_codes.cc",
"xkb/xkb_evdev_codes.h",
"xkb/xkb_key_code_converter.h",
"xkb/xkb_keyboard_layout_engine.cc",
"xkb/xkb_keyboard_layout_engine.h",
]
deps += [ "//ui/events/keycodes:xkb" ]
}
}

@ -32,7 +32,7 @@ source_set("ozone_demo_lib") {
"//ui/display/types",
"//ui/events",
"//ui/events:dom_keycode_converter",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/gfx/geometry",
"//ui/ozone",
"//ui/platform_window",
@ -61,7 +61,7 @@ executable("ozone_demo") {
"//components/tracing:startup_tracing",
"//gpu/vulkan:buildflags",
"//mojo/core/embedder",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/gl",
"//ui/gl/init",
"//ui/ozone",
@ -94,7 +94,7 @@ executable("skia_demo") {
"//components/tracing:startup_tracing",
"//mojo/core/embedder",
"//skia",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/gl",
"//ui/gl/init",
"//ui/ozone",

@ -46,7 +46,7 @@ source_set("cast") {
"//ui/base/ime",
"//ui/events/ozone:events_ozone",
"//ui/events/ozone:events_ozone_evdev",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/ozone:ozone_base",

@ -141,7 +141,7 @@ source_set("gbm") {
"//ui/events/devices",
"//ui/events/ozone:events_ozone",
"//ui/events/ozone:events_ozone_evdev",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx/geometry",

@ -28,7 +28,7 @@ source_set("headless") {
"//ui/base",
"//ui/base/ime",
"//ui/events",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/events/platform",
"//ui/gfx/geometry",
"//ui/ozone:ozone_base",

@ -57,7 +57,7 @@ source_set("scenic") {
"//ui/base/ime/fuchsia",
"//ui/display/fake",
"//ui/events:dom_keycode_converter",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/gfx/geometry",
"//ui/ozone:ozone_base",
"//ui/ozone/common",

@ -115,7 +115,7 @@ source_set("wayland") {
import("//ui/base/ui_features.gni")
if (use_xkbcommon) {
configs += [ "//ui/events/ozone:xkbcommon" ]
configs += [ "//ui/events/ozone/layout:xkbcommon" ]
}
deps = [
@ -139,7 +139,7 @@ source_set("wayland") {
"//ui/events/keycodes:xkb",
"//ui/events/ozone:events_ozone",
"//ui/events/ozone:events_ozone_evdev",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx:memory_buffer",
@ -290,7 +290,7 @@ source_set("wayland_unittests") {
"//ui/base",
"//ui/base:buildflags",
"//ui/base/ime/linux",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/ozone:platform",
"//ui/ozone:test_support",
"//ui/ozone/common/linux:drm",

@ -26,7 +26,7 @@ source_set("windows") {
"//ui/base",
"//ui/display/fake",
"//ui/events",
"//ui/events/ozone:events_ozone_layout",
"//ui/events/ozone/layout",
"//ui/events/platform",
"//ui/gfx/geometry",
"//ui/gl",