| Index: ui/aura/BUILD.gn
|
| diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
|
| index 4b58b6c45e6a183348b9153613ff950c20a649e6..24d44cc5ee8d28e720ca349f096ca596355db3d9 100644
|
| --- a/ui/aura/BUILD.gn
|
| +++ b/ui/aura/BUILD.gn
|
| @@ -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 ("//build/config/ui.gni")
|
| +import("//build/config/ui.gni")
|
|
|
| component("aura") {
|
| sources = [
|
| @@ -88,9 +88,7 @@ component("aura") {
|
| "../wm/public/window_types.h",
|
| ]
|
|
|
| - defines = [
|
| - "AURA_IMPLEMENTATION",
|
| - ]
|
| + defines = [ "AURA_IMPLEMENTATION" ]
|
|
|
| deps = [
|
| "//base",
|
| @@ -110,9 +108,7 @@ component("aura") {
|
| "//build/config/linux:x11",
|
| "//build/config/linux:xrandr",
|
| ]
|
| - deps += [
|
| - "//ui/events/platform/x11",
|
| - ]
|
| + deps += [ "//ui/events/platform/x11" ]
|
| }
|
|
|
| if (is_win) {
|
| @@ -120,9 +116,7 @@ component("aura") {
|
| "input_state_lookup.cc",
|
| "window_tree_host_x11.cc",
|
| ]
|
| - deps += [
|
| - "//ui/platform_window/win",
|
| - ]
|
| + deps += [ "//ui/platform_window/win" ]
|
| }
|
|
|
| if (use_ozone) {
|
| @@ -130,7 +124,6 @@ component("aura") {
|
| "window_tree_host_ozone.cc",
|
| "window_tree_host_ozone.h",
|
| ]
|
| -
|
| # TODO(GYP) enable when these targets exist.
|
| #deps += [
|
| # "//ui/events/ozone",
|
| @@ -140,167 +133,153 @@ component("aura") {
|
| }
|
|
|
| if (false) {
|
| + source_set("test_support") {
|
| + testonly = true
|
| + sources = [
|
| + "test/aura_test_base.cc",
|
| + "test/aura_test_base.h",
|
| + "test/aura_test_helper.cc",
|
| + "test/aura_test_helper.h",
|
| + "test/aura_test_utils.cc",
|
| + "test/aura_test_utils.h",
|
| + "test/env_test_helper.h",
|
| + "test/event_generator_delegate_aura.cc",
|
| + "test/event_generator_delegate_aura.h",
|
| + "test/test_cursor_client.cc",
|
| + "test/test_cursor_client.h",
|
| + "test/test_focus_client.cc",
|
| + "test/test_focus_client.h",
|
| + "test/test_screen.cc",
|
| + "test/test_screen.h",
|
| + "test/test_window_tree_client.cc",
|
| + "test/test_window_tree_client.h",
|
| + "test/test_windows.cc",
|
| + "test/test_windows.h",
|
| + "test/test_window_delegate.cc",
|
| + "test/test_window_delegate.h",
|
| + "test/ui_controls_factory_aura.h",
|
| + "test/window_event_dispatcher_test_api.cc",
|
| + "test/window_event_dispatcher_test_api.h",
|
| + "test/window_test_api.cc",
|
| + "test/window_test_api.h",
|
| + ]
|
|
|
| -source_set("test_support") {
|
| - testonly = true
|
| - sources = [
|
| - "test/aura_test_base.cc",
|
| - "test/aura_test_base.h",
|
| - "test/aura_test_helper.cc",
|
| - "test/aura_test_helper.h",
|
| - "test/aura_test_utils.cc",
|
| - "test/aura_test_utils.h",
|
| - "test/env_test_helper.h",
|
| - "test/event_generator_delegate_aura.cc",
|
| - "test/event_generator_delegate_aura.h",
|
| - "test/test_cursor_client.cc",
|
| - "test/test_cursor_client.h",
|
| - "test/test_focus_client.cc",
|
| - "test/test_focus_client.h",
|
| - "test/test_screen.cc",
|
| - "test/test_screen.h",
|
| - "test/test_window_tree_client.cc",
|
| - "test/test_window_tree_client.h",
|
| - "test/test_windows.cc",
|
| - "test/test_windows.h",
|
| - "test/test_window_delegate.cc",
|
| - "test/test_window_delegate.h",
|
| - "test/ui_controls_factory_aura.h",
|
| - "test/window_event_dispatcher_test_api.cc",
|
| - "test/window_event_dispatcher_test_api.h",
|
| - "test/window_test_api.cc",
|
| - "test/window_test_api.h",
|
| - ]
|
| -
|
| - public_deps = [
|
| - ":aura",
|
| - ]
|
| - deps = [
|
| - "//skia",
|
| - "//testing/gtest",
|
| - "//ui/base:test_support",
|
| - "//ui/compositor:test_support",
|
| - "//ui/events",
|
| - "//ui/events:events_base",
|
| - "//ui/events:test_support",
|
| - "//ui/gfx",
|
| - "//ui/gfx/geometry",
|
| - "//ui/wm",
|
| - ]
|
| -
|
| - if (is_win) {
|
| - cflags = [
|
| - "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| + public_deps = [
|
| + ":aura",
|
| + ]
|
| + deps = [
|
| + "//skia",
|
| + "//testing/gtest",
|
| + "//ui/base:test_support",
|
| + "//ui/compositor:test_support",
|
| + "//ui/events",
|
| + "//ui/events:events_base",
|
| + "//ui/events:test_support",
|
| + "//ui/gfx",
|
| + "//ui/gfx/geometry",
|
| + "//ui/wm",
|
| ]
|
| - }
|
|
|
| - if (use_aura) {
|
| if (is_win) {
|
| - sources += [
|
| - "test/ui_controls_factory_aurawin.cc",
|
| - ]
|
| + cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| }
|
|
|
| - if (use_x11) {
|
| - sources += [
|
| - "test/ui_controls_factory_aurax11.cc",
|
| - ]
|
| + if (use_aura) {
|
| + if (is_win) {
|
| + sources += [ "test/ui_controls_factory_aurawin.cc" ]
|
| + }
|
| +
|
| + if (use_x11) {
|
| + sources += [ "test/ui_controls_factory_aurax11.cc" ]
|
| + }
|
| }
|
| }
|
| -}
|
|
|
| -executable("demo") {
|
| - output_name = "aura_demo"
|
| - testonly = true
|
| + executable("demo") {
|
| + output_name = "aura_demo"
|
| + testonly = true
|
|
|
| - sources = [
|
| - "demo/demo_main.cc",
|
| - ]
|
| -
|
| - deps = [
|
| - ":aura",
|
| - ":test_support",
|
| - "//base",
|
| - "//base:i18n",
|
| - "//skia",
|
| - "//third_party/icu",
|
| - "//ui/base",
|
| - "//ui/compositor",
|
| - "//ui/compositor:test_support",
|
| - "//ui/events",
|
| - "//ui/gfx",
|
| - "//ui/gfx/geometry",
|
| - "//ui/gl",
|
| - ]
|
| + sources = [
|
| + "demo/demo_main.cc",
|
| + ]
|
|
|
| - if (use_x11) {
|
| - deps += [
|
| - "//ui/gfx/x",
|
| + deps = [
|
| + ":aura",
|
| + ":test_support",
|
| + "//base",
|
| + "//base:i18n",
|
| + "//skia",
|
| + "//third_party/icu",
|
| + "//ui/base",
|
| + "//ui/compositor",
|
| + "//ui/compositor:test_support",
|
| + "//ui/events",
|
| + "//ui/gfx",
|
| + "//ui/gfx/geometry",
|
| + "//ui/gl",
|
| ]
|
| +
|
| + if (use_x11) {
|
| + deps += [ "//ui/gfx/x" ]
|
| + }
|
| }
|
| -}
|
|
|
| -executable("bench") {
|
| - output_name = "aura_bench"
|
| - testonly = true
|
| + executable("bench") {
|
| + output_name = "aura_bench"
|
| + testonly = true
|
|
|
| - sources = [
|
| - "bench/bench_main.cc",
|
| - ]
|
| -
|
| - deps = [
|
| - ":test_support",
|
| - "//base",
|
| - "//base:i18n",
|
| - "//cc",
|
| - "//gpu/command_buffer/client:gles2_interface",
|
| - "//skia",
|
| - "//third_party/icu",
|
| - "//ui/base",
|
| - "//ui/compositor",
|
| - "//ui/compositor:test_support",
|
| - "//ui/events",
|
| - "//ui/gfx",
|
| - "//ui/gfx/geometry",
|
| - "//ui/gl",
|
| - ]
|
| + sources = [
|
| + "bench/bench_main.cc",
|
| + ]
|
|
|
| - if (use_x11) {
|
| - deps += [
|
| - "//ui/gfx/x",
|
| + deps = [
|
| + ":test_support",
|
| + "//base",
|
| + "//base:i18n",
|
| + "//cc",
|
| + "//gpu/command_buffer/client:gles2_interface",
|
| + "//skia",
|
| + "//third_party/icu",
|
| + "//ui/base",
|
| + "//ui/compositor",
|
| + "//ui/compositor:test_support",
|
| + "//ui/events",
|
| + "//ui/gfx",
|
| + "//ui/gfx/geometry",
|
| + "//ui/gl",
|
| ]
|
| - }
|
| -}
|
|
|
| -test("aura_unittests") {
|
| - sources = [
|
| - "gestures/gesture_recognizer_unittest.cc",
|
| - "test/run_all_unittests.cc",
|
| - "window_event_dispatcher_unittest.cc",
|
| - "window_targeter_unittest.cc",
|
| - "window_unittest.cc",
|
| - ]
|
| + if (use_x11) {
|
| + deps += [ "//ui/gfx/x" ]
|
| + }
|
| + }
|
|
|
| - deps = [
|
| - ":test_support",
|
| - "//base/allocator",
|
| - "//base/test:test_support",
|
| - "//skia",
|
| - "//testing/gtest",
|
| - "//ui/base:test_support",
|
| - "//ui/compositor:test_support",
|
| - "//ui/events:test_support",
|
| - "//ui/events:gesture_detection",
|
| - "//ui/gfx",
|
| - "//ui/gfx/geometry",
|
| - "//ui/gl",
|
| - ]
|
| + test("aura_unittests") {
|
| + sources = [
|
| + "gestures/gesture_recognizer_unittest.cc",
|
| + "test/run_all_unittests.cc",
|
| + "window_event_dispatcher_unittest.cc",
|
| + "window_targeter_unittest.cc",
|
| + "window_unittest.cc",
|
| + ]
|
|
|
| - if (is_linux) {
|
| - deps += [
|
| - "//third_party/mesa",
|
| + deps = [
|
| + ":test_support",
|
| + "//base/allocator",
|
| + "//base/test:test_support",
|
| + "//skia",
|
| + "//testing/gtest",
|
| + "//ui/base:test_support",
|
| + "//ui/compositor:test_support",
|
| + "//ui/events:test_support",
|
| + "//ui/events:gesture_detection",
|
| + "//ui/gfx",
|
| + "//ui/gfx/geometry",
|
| + "//ui/gl",
|
| ]
|
| - }
|
| -}
|
|
|
| + if (is_linux) {
|
| + deps += [ "//third_party/mesa" ]
|
| + }
|
| + }
|
| } # if (false)
|
|
|