Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/display/BUILD.gn

Issue 1104703004: Windows GN component build fixes: sync, ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/attachments/proto/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/BUILD.gn
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index d3dcaa661911edeb245f77b8a37aed52915d8335..7519929049c01db6cd7152fc2294167e84484bee 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -5,134 +5,138 @@
import("//build/config/ui.gni")
import("//testing/test.gni")
-component("display") {
- sources = [
- "chromeos/apply_content_protection_task.cc",
- "chromeos/apply_content_protection_task.h",
- "chromeos/configure_displays_task.cc",
- "chromeos/configure_displays_task.h",
- "chromeos/display_configurator.cc",
- "chromeos/display_configurator.h",
- "chromeos/display_layout_manager.h",
- "chromeos/display_util.cc",
- "chromeos/display_util.h",
- "chromeos/ozone/display_configurator_ozone.cc",
- "chromeos/query_content_protection_task.cc",
- "chromeos/query_content_protection_task.h",
- "chromeos/update_display_configuration_task.cc",
- "chromeos/update_display_configuration_task.h",
- "chromeos/x11/display_configurator_x11.cc",
- "chromeos/x11/display_mode_x11.cc",
- "chromeos/x11/display_mode_x11.h",
- "chromeos/x11/display_snapshot_x11.cc",
- "chromeos/x11/display_snapshot_x11.h",
- "chromeos/x11/display_util_x11.cc",
- "chromeos/x11/display_util_x11.h",
- "chromeos/x11/native_display_delegate_x11.cc",
- "chromeos/x11/native_display_delegate_x11.h",
- "chromeos/x11/native_display_event_dispatcher_x11.cc",
- "chromeos/x11/native_display_event_dispatcher_x11.h",
- "display_export.h",
- "display_switches.cc",
- "display_switches.h",
- ]
-
- defines = [ "DISPLAY_IMPLEMENTATION" ]
+if (is_chromeos) {
+ component("display") {
+ sources = [
+ "chromeos/apply_content_protection_task.cc",
+ "chromeos/apply_content_protection_task.h",
+ "chromeos/configure_displays_task.cc",
+ "chromeos/configure_displays_task.h",
+ "chromeos/display_configurator.cc",
+ "chromeos/display_configurator.h",
+ "chromeos/display_layout_manager.h",
+ "chromeos/display_util.cc",
+ "chromeos/display_util.h",
+ "chromeos/ozone/display_configurator_ozone.cc",
+ "chromeos/query_content_protection_task.cc",
+ "chromeos/query_content_protection_task.h",
+ "chromeos/update_display_configuration_task.cc",
+ "chromeos/update_display_configuration_task.h",
+ "chromeos/x11/display_configurator_x11.cc",
+ "chromeos/x11/display_mode_x11.cc",
+ "chromeos/x11/display_mode_x11.h",
+ "chromeos/x11/display_snapshot_x11.cc",
+ "chromeos/x11/display_snapshot_x11.h",
+ "chromeos/x11/display_util_x11.cc",
+ "chromeos/x11/display_util_x11.h",
+ "chromeos/x11/native_display_delegate_x11.cc",
+ "chromeos/x11/native_display_delegate_x11.h",
+ "chromeos/x11/native_display_event_dispatcher_x11.cc",
+ "chromeos/x11/native_display_event_dispatcher_x11.h",
+ "display_export.h",
+ "display_switches.cc",
+ "display_switches.h",
+ ]
- deps = [
- "//base",
- "//ui/display/util",
- "//ui/gfx",
- "//ui/gfx/geometry",
- ]
+ defines = [ "DISPLAY_IMPLEMENTATION" ]
- if (use_x11) {
- configs += [
- "//build/config/linux:x11",
- "//build/config/linux:xext",
- "//build/config/linux:xi",
- "//build/config/linux:xrandr",
+ deps = [
+ "//base",
+ "//ui/display/util",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
]
- deps += [ "//ui/events/platform" ]
- if (is_chromeos) {
- sources -= [ "chromeos/ozone/display_configurator_ozone.cc" ]
- }
- }
- if (is_chromeos) {
- deps += [ "//ui/display/types" ]
if (use_x11) {
- deps += [ "//ui/gfx/x" ]
+ configs += [
+ "//build/config/linux:x11",
+ "//build/config/linux:xext",
+ "//build/config/linux:xi",
+ "//build/config/linux:xrandr",
+ ]
+ deps += [ "//ui/events/platform" ]
+ if (is_chromeos) {
Dirk Pranke 2015/04/24 22:02:49 these (here and line 63) if (is_chromeos) checks a
+ sources -= [ "chromeos/ozone/display_configurator_ozone.cc" ]
+ }
}
- }
- if (use_ozone) {
- deps += [ "//ui/ozone" ]
if (is_chromeos) {
- sources -= [
- "chromeos/x11/display_configurator_x11.cc",
- "chromeos/x11/display_mode_x11.cc",
- "chromeos/x11/display_mode_x11.h",
- "chromeos/x11/display_snapshot_x11.cc",
- "chromeos/x11/display_snapshot_x11.h",
- "chromeos/x11/display_util_x11.cc",
- "chromeos/x11/display_util_x11.h",
- "chromeos/x11/native_display_delegate_x11.cc",
- "chromeos/x11/native_display_delegate_x11.h",
- "chromeos/x11/native_display_event_dispatcher_x11.cc",
- "chromeos/x11/native_display_event_dispatcher_x11.h",
- ]
+ deps += [ "//ui/display/types" ]
+ if (use_x11) {
+ deps += [ "//ui/gfx/x" ]
+ }
+ }
+
+ if (use_ozone) {
+ deps += [ "//ui/ozone" ]
+ if (is_chromeos) {
+ sources -= [
+ "chromeos/x11/display_configurator_x11.cc",
+ "chromeos/x11/display_mode_x11.cc",
+ "chromeos/x11/display_mode_x11.h",
+ "chromeos/x11/display_snapshot_x11.cc",
+ "chromeos/x11/display_snapshot_x11.h",
+ "chromeos/x11/display_util_x11.cc",
+ "chromeos/x11/display_util_x11.h",
+ "chromeos/x11/native_display_delegate_x11.cc",
+ "chromeos/x11/native_display_delegate_x11.h",
+ "chromeos/x11/native_display_event_dispatcher_x11.cc",
+ "chromeos/x11/native_display_event_dispatcher_x11.h",
+ ]
+ }
}
}
-}
-component("test_util") {
- output_name = "display_test_util"
- sources = [
- "chromeos/test/test_display_snapshot.cc",
- "chromeos/test/test_display_snapshot.h",
- ]
+ component("test_util") {
+ output_name = "display_test_util"
+ sources = [
+ "chromeos/test/test_display_snapshot.cc",
+ "chromeos/test/test_display_snapshot.h",
+ ]
- defines = [ "DISPLAY_IMPLEMENTATION" ]
+ defines = [ "DISPLAY_IMPLEMENTATION" ]
- public_deps = [
- ":display",
- ]
- deps = [
- "//base",
- "//ui/gfx",
- "//ui/gfx/geometry",
- ]
+ public_deps = [
+ ":display",
+ ]
+ deps = [
+ "//base",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
+ ]
- if (is_chromeos) {
- deps += [ "//ui/display/types" ]
+ if (is_chromeos) {
+ deps += [ "//ui/display/types" ]
+ }
}
-}
-source_set("test_support") {
- testonly = true
- sources = [
- "chromeos/test/action_logger.cc",
- "chromeos/test/action_logger.h",
- "chromeos/test/action_logger_util.cc",
- "chromeos/test/action_logger_util.h",
- "chromeos/test/test_display_layout_manager.cc",
- "chromeos/test/test_display_layout_manager.h",
- "chromeos/test/test_native_display_delegate.cc",
- "chromeos/test/test_native_display_delegate.h",
- ]
+ source_set("test_support") {
+ testonly = true
+ sources = [
+ "chromeos/test/action_logger.cc",
+ "chromeos/test/action_logger.h",
+ "chromeos/test/action_logger_util.cc",
+ "chromeos/test/action_logger_util.h",
+ "chromeos/test/test_display_layout_manager.cc",
+ "chromeos/test/test_display_layout_manager.h",
+ "chromeos/test/test_native_display_delegate.cc",
+ "chromeos/test/test_native_display_delegate.h",
+ ]
- public_deps = [
- ":display",
- ]
- deps = [
- "//base",
- "//ui/display/types",
- "//ui/gfx",
- "//ui/gfx/geometry",
- ]
+ public_deps = [
+ ":display",
+ ]
+ deps = [
+ "//base",
+ "//ui/display/types",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
+ ]
+ }
}
+# This test covers the ChromeOS "display" target as well as the cross-platform
+# //display/util target.
test("display_unittests") {
sources = [
"chromeos/apply_content_protection_task_unittest.cc",
@@ -147,7 +151,6 @@ test("display_unittests") {
]
deps = [
- ":test_util",
"//base",
"//base/test:run_all_unittests",
"//testing/gtest",
@@ -159,6 +162,7 @@ test("display_unittests") {
deps += [
":display",
":test_support",
+ ":test_util",
"//base/test:test_support",
"//ui/display/types",
]
« no previous file with comments | « sync/internal_api/attachments/proto/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698