summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/public/browser/BUILD.gn2
-rw-r--r--ui/app_list/BUILD.gn3
-rw-r--r--ui/aura/BUILD.gn2
-rw-r--r--ui/base/BUILD.gn1
-rw-r--r--ui/base/ime/BUILD.gn1
-rw-r--r--ui/compositor/BUILD.gn1
-rw-r--r--ui/events/BUILD.gn32
-rw-r--r--ui/events/ipc/BUILD.gn5
-rw-r--r--ui/events/platform/BUILD.gn5
-rw-r--r--ui/gfx/x/BUILD.gn1
-rw-r--r--ui/gl/BUILD.gn10
-rw-r--r--ui/keyboard/BUILD.gn1
-rw-r--r--ui/keyboard/webui/BUILD.gn2
-rw-r--r--ui/message_center/BUILD.gn4
-rw-r--r--ui/platform_window/BUILD.gn6
-rw-r--r--ui/snapshot/BUILD.gn1
-rw-r--r--ui/views/BUILD.gn13
-rw-r--r--ui/views/controls/webview/BUILD.gn4
-rw-r--r--ui/web_dialogs/BUILD.gn2
-rw-r--r--ui/wm/BUILD.gn9
20 files changed, 64 insertions, 41 deletions
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 378eed5..a953484 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -15,8 +15,6 @@ group("browser") {
}
source_set("sources") {
- visibility = [ "//content", ":browser" ]
-
if (is_ios) {
# iOS doesn't get the normal file list and only takes these whitelisted
# files.
diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn
index 76c5cb3..192f63f 100644
--- a/ui/app_list/BUILD.gn
+++ b/ui/app_list/BUILD.gn
@@ -48,6 +48,7 @@ component("app_list") {
"//base:i18n",
"//base/third_party/dynamic_annotations",
"//skia",
+ "//ui/accessibility",
"//ui/base",
"//ui/compositor",
"//ui/events:events_base",
@@ -195,6 +196,8 @@ test("app_list_unittests") {
"//testing/gtest",
"//ui/base",
"//ui/compositor",
+ "//ui/events",
+ "//ui/gl",
"//ui/resources",
"//ui/resources:ui_test_pak",
]
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index 7f4c9c4..b5f0849 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn
@@ -225,6 +225,7 @@ executable("demo") {
"//ui/events",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gl",
]
if (use_x11) {
@@ -254,6 +255,7 @@ executable("bench") {
"//ui/events",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gl",
]
if (use_x11) {
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 253ccea..94b1864 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -558,6 +558,7 @@ source_set("test_support") {
]
deps = [
+ ":base",
"//base",
"//skia",
"//testing/gtest",
diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn
index 098ec16..27125fe 100644
--- a/ui/base/ime/BUILD.gn
+++ b/ui/base/ime/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/ui.gni")
source_set("ime") {
# GYP version: ui/base/ime/ime.gypi, which is included into ui_base
sources = [
+ "../ui_base_export.h",
"candidate_window.cc",
"candidate_window.h",
"chromeos/character_composer.cc",
diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
index 59d5005..03ed5fc 100644
--- a/ui/compositor/BUILD.gn
+++ b/ui/compositor/BUILD.gn
@@ -58,6 +58,7 @@ component("compositor") {
"//base",
"//base/third_party/dynamic_annotations",
"//cc",
+ "//cc/surfaces",
"//gpu/command_buffer/common",
"//skia",
"//ui/gfx",
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 21981fd..5cef145 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -72,18 +72,6 @@ component("events_base") {
}
component("events") {
- deps = [
- ":dom4_keycode_converter",
- ":events_base",
- ":gesture_detection",
- "//base/third_party/dynamic_annotations",
- "//skia",
- "//ui/gfx",
- "//ui/gfx/geometry",
- ]
-
- defines = [ "EVENTS_IMPLEMENTATION" ]
-
sources = [
"cocoa/cocoa_event_utils.h",
"cocoa/cocoa_event_utils.mm",
@@ -114,6 +102,20 @@ component("events") {
"x/events_x.cc",
]
+ defines = [ "EVENTS_IMPLEMENTATION" ]
+
+ deps = [
+ ":dom4_keycode_converter",
+ ":events_base",
+ ":gesture_detection",
+ "//base/third_party/dynamic_annotations",
+ "//skia",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
+ ]
+
+ forward_dependent_configs_from = [ ":events_base" ]
+
if (use_x11) {
configs += [
"//build/config/linux:glib",
@@ -231,13 +233,13 @@ source_set("test_support") {
]
deps = [
+ ":events",
+ ":events_base",
+ ":gesture_detection",
"//base",
"//skia",
"//ui/events/platform",
"//ui/gfx/geometry",
- ":events",
- ":events_base",
- ":gesture_detection",
]
if (is_ios) {
diff --git a/ui/events/ipc/BUILD.gn b/ui/events/ipc/BUILD.gn
index 669e80c..0462410 100644
--- a/ui/events/ipc/BUILD.gn
+++ b/ui/events/ipc/BUILD.gn
@@ -13,6 +13,9 @@ component("ipc") {
defines = [ "EVENTS_IMPLEMENTATION" ]
- deps = [ "//ipc" ]
+ deps = [
+ "//ipc",
+ "//ui/events",
+ ]
}
diff --git a/ui/events/platform/BUILD.gn b/ui/events/platform/BUILD.gn
index 3a20219..4008a23 100644
--- a/ui/events/platform/BUILD.gn
+++ b/ui/events/platform/BUILD.gn
@@ -6,6 +6,9 @@ import("//build/config/ui.gni")
component("platform") {
sources = [
+ # Allow this target to include events_export.h without depending on the
+ # events target (which would be circular).
+ "../events_export.h",
"platform_event_dispatcher.h",
"platform_event_observer.h",
"platform_event_source.cc",
@@ -21,7 +24,7 @@ component("platform") {
]
deps = [
- "//base"
+ "//base",
]
if (use_x11) {
diff --git a/ui/gfx/x/BUILD.gn b/ui/gfx/x/BUILD.gn
index 68693a4..dfc50b3 100644
--- a/ui/gfx/x/BUILD.gn
+++ b/ui/gfx/x/BUILD.gn
@@ -7,6 +7,7 @@ component("x") {
output_name = "gfx_x11"
sources = [
+ "../gfx_export.h",
"x11_atom_cache.cc",
"x11_atom_cache.h",
"x11_connection.cc",
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index f4c94b0..bf6f32a 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/config/ui.gni")
if (is_android) {
+ import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
}
@@ -246,15 +247,14 @@ component("gl") {
"gl_surface_ozone.cc",
]
deps += [
- #"//ui/gfx/ozone",
"//ui/ozone",
+ "//ui/ozone:ozone_base",
]
}
- # TODO(GYP) enable this dependency once its written.
- #if (is_android && !android_webview_build) {
- # deps += [ "//ui/android:ui_java" ]
- #}
+ if (is_android && !is_android_webview_build) {
+ deps += [ "//ui/android:ui_java" ]
+ }
}
action("generate_gl_bindings") {
diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn
index d528115..cb1a01f 100644
--- a/ui/keyboard/BUILD.gn
+++ b/ui/keyboard/BUILD.gn
@@ -91,6 +91,7 @@ test("keyboard_unittests") {
"//ui/compositor:test_support",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gl",
"//ui/resources:ui_test_pak",
"//ui/wm",
"//url",
diff --git a/ui/keyboard/webui/BUILD.gn b/ui/keyboard/webui/BUILD.gn
index c8937b9..6672ca4 100644
--- a/ui/keyboard/webui/BUILD.gn
+++ b/ui/keyboard/webui/BUILD.gn
@@ -16,6 +16,7 @@ source_set("webui") {
visibility = "//ui/keyboard"
sources = [
+ "../keyboard_export.h",
"vk_mojo_handler.cc",
"vk_mojo_handler.h",
"vk_webui_controller.cc",
@@ -26,6 +27,7 @@ source_set("webui") {
":mojo_bindings",
"//base",
"//content/public/browser",
+ "//content/public/common",
"//ui/aura",
"//ui/base",
"//ui/keyboard:resources",
diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn
index bca5793..96315b5 100644
--- a/ui/message_center/BUILD.gn
+++ b/ui/message_center/BUILD.gn
@@ -13,7 +13,9 @@ component("message_center") {
"//base:i18n",
"//base/third_party/dynamic_annotations",
"//skia",
+ "//ui/accessibility",
"//ui/base",
+ "//ui/events",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/resources",
@@ -178,8 +180,10 @@ test("message_center_unittests") {
"//skia",
"//testing/gtest",
"//ui/base",
+ "//ui/events",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gl",
"//ui/resources",
"//ui/resources:ui_test_pak",
"//url",
diff --git a/ui/platform_window/BUILD.gn b/ui/platform_window/BUILD.gn
index aa0c85d..ed4d3d6 100644
--- a/ui/platform_window/BUILD.gn
+++ b/ui/platform_window/BUILD.gn
@@ -10,4 +10,10 @@ component("platform_window") {
"platform_window_delegate.h",
"platform_window_export.h",
]
+
+ deps = [
+ "//base",
+ "//ui/base",
+ "//ui/gfx",
+ ]
}
diff --git a/ui/snapshot/BUILD.gn b/ui/snapshot/BUILD.gn
index f3d3bcc..f294800 100644
--- a/ui/snapshot/BUILD.gn
+++ b/ui/snapshot/BUILD.gn
@@ -69,6 +69,7 @@ test("snapshot_unittests") {
"//ui/base",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gl",
]
if (use_aura) {
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 9b51714..efe30ac 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -117,6 +117,7 @@ static_library("test_support") {
"//ui/compositor",
"//ui/compositor:test_support",
"//ui/events",
+ "//ui/events:events_base",
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx/geometry",
@@ -135,8 +136,6 @@ static_library("test_support") {
}
}
-if (false) { # TODO(GYP) enable once this links
-
test("views_unittests") {
sources = gypi_values.views_unittests_sources
@@ -160,6 +159,7 @@ test("views_unittests") {
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gl",
"//ui/wm",
"//url",
]
@@ -201,14 +201,9 @@ test("views_unittests") {
]
}
- if (use_ozone) {
- sources -= [
- "corewm/capture_controller_unittest.cc",
- ]
- }
if (use_aura) {
sources += gypi_values.views_unittests_aura_sources
- deps = [ "//ui/aura:test_support" ]
+ deps += [ "//ui/aura:test_support" ]
if (!is_chromeos) {
sources += gypi_values.views_unittests_desktop_aura_sources
}
@@ -255,5 +250,3 @@ if (is_mac) {
]
}
}
-
-} # if false
diff --git a/ui/views/controls/webview/BUILD.gn b/ui/views/controls/webview/BUILD.gn
index 260e4c1..2907fc7 100644
--- a/ui/views/controls/webview/BUILD.gn
+++ b/ui/views/controls/webview/BUILD.gn
@@ -23,8 +23,10 @@ component("webview") {
"//base/third_party/dynamic_annotations",
"//content/public/browser",
"//skia",
+ "//ui/accessibility",
"//ui/base",
"//ui/events",
+ "//ui/events:events_base",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/web_dialogs",
@@ -47,6 +49,7 @@ source_set("test_support") {
":webview",
"//base",
"//content",
+ "//content/test:test_support",
"//ipc:test_support",
"//skia",
"//testing/gtest",
@@ -57,6 +60,5 @@ source_set("test_support") {
"//ui/gfx/geometry",
"//ui/views",
"//ui/views:test_support",
- #'../../../../content/content_shell_and_tests.gyp:test_support_content', TODO(GYP)
]
}
diff --git a/ui/web_dialogs/BUILD.gn b/ui/web_dialogs/BUILD.gn
index d9e8e13..6cf5289 100644
--- a/ui/web_dialogs/BUILD.gn
+++ b/ui/web_dialogs/BUILD.gn
@@ -19,7 +19,9 @@ component("web_dialogs") {
"//base",
"//base/third_party/dynamic_annotations",
"//content/public/browser",
+ "//content/public/common",
"//skia",
+ "//ui/base",
]
}
diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
index 5a97674..ec2da75 100644
--- a/ui/wm/BUILD.gn
+++ b/ui/wm/BUILD.gn
@@ -96,18 +96,16 @@ static_library("test_support") {
]
deps = [
+ ":wm",
"//skia",
"//ui/aura",
+ "//ui/aura:test_support",
"//ui/base",
"//ui/events",
"//ui/events:events_base",
]
}
-# TODO(GYP) enable the wm_unittests target when all dependencies have been
-# resolved. Some transitive deps aren't converted yet.
-if (false) {
-
test("wm_unittests") {
sources = [
"test/run_all_unittests.cc",
@@ -141,7 +139,6 @@ test("wm_unittests") {
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx/geometry",
+ "//ui/gl",
]
}
-
-}
generated by cgit v1.1 at 2024-10-31 16:24:25 +0000