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

Side by Side Diff: ash/BUILD.gn

Issue 404603002: GN fixes for the Windows build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typo Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 7
8 gypi_values = exec_script( 8 gypi_values = exec_script(
9 "//build/gypi_to_gn.py", 9 "//build/gypi_to_gn.py",
10 [ rebase_path("ash.gyp") ], 10 [ rebase_path("ash.gyp") ],
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #'../ui/views/views.gyp:views' TODO(GYP), 49 #'../ui/views/views.gyp:views' TODO(GYP),
50 ] 50 ]
51 51
52 forward_dependent_configs_from = [ 52 forward_dependent_configs_from = [
53 "//ash/resources", 53 "//ash/resources",
54 "//ash/strings", 54 "//ash/strings",
55 ] 55 ]
56 56
57 if (is_win) { 57 if (is_win) {
58 sources -= [ 58 sources -= [
59 "host/window_tree_host_factory.cc",
60 "sticky_keys/sticky_keys_controller.cc", 59 "sticky_keys/sticky_keys_controller.cc",
61 "sticky_keys/sticky_keys_controller.h", 60 "sticky_keys/sticky_keys_controller.h",
62 ] 61 ]
63 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 62 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
64 cflags = [ "/wd4267" ] 63 cflags = [ "/wd4267" ]
65 } 64 }
66 65
67 if (use_x11) { 66 if (use_x11) {
68 configs += [ 67 configs += [
69 "//build/config/linux:xfixes", 68 "//build/config/linux:xfixes",
70 ] 69 ]
71 } else { 70 } else {
72 sources -= [ 71 sources -= [
73 "accelerators/key_hold_detector.cc", 72 "accelerators/key_hold_detector.cc",
74 "accelerators/key_hold_detector.h", 73 "accelerators/key_hold_detector.h",
75 "accelerators/magnifier_key_scroller.cc", 74 "accelerators/magnifier_key_scroller.cc",
76 "accelerators/magnifier_key_scroller.h", 75 "accelerators/magnifier_key_scroller.h",
77 "accelerators/spoken_feedback_toggler.cc", 76 "accelerators/spoken_feedback_toggler.cc",
78 "accelerators/spoken_feedback_toggler.h", 77 "accelerators/spoken_feedback_toggler.h",
79 "touch/touch_transformer_controller.cc",
80 "touch/touch_transformer_controller.h",
81 ] 78 ]
82 } 79 }
83 80
84 if (is_chromeos) { 81 if (is_chromeos) {
85 deps += [ 82 deps += [
86 #'../chromeos/chromeos.gyp:chromeos', TODO(GYP) 83 #'../chromeos/chromeos.gyp:chromeos', TODO(GYP)
87 # Ash #includes power_supply_properties.pb.h directly. 84 # Ash #includes power_supply_properties.pb.h directly.
88 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP) 85 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP)
89 #'../device/bluetooth/bluetooth.gyp:device_bluetooth', TODO(GYP) 86 #'../device/bluetooth/bluetooth.gyp:device_bluetooth', TODO(GYP)
90 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', TODO(GYP) 87 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', TODO(GYP)
91 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', TODO(GYP) 88 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', TODO(GYP)
92 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos', TODO(GYP) 89 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos', TODO(GYP)
93 #'../ui/display/display.gyp:display', TODO(GYP) 90 #'../ui/display/display.gyp:display', TODO(GYP)
94 #'../ui/display/display.gyp:display_util', TODO(GYP) 91 #'../ui/display/display.gyp:display_util', TODO(GYP)
95 ] 92 ]
96 } else { 93 } else {
97 sources -= [ 94 sources -= [
98 "display/display_configurator_animation.cc", 95 "display/display_configurator_animation.cc",
99 "display/display_configurator_animation.h", 96 "display/display_configurator_animation.h",
100 "display/resolution_notification_controller.cc", 97 "display/resolution_notification_controller.cc",
101 "display/resolution_notification_controller.h", 98 "display/resolution_notification_controller.h",
102 "system/tray/media_security/media_capture_observer.h", 99 "system/tray/media_security/media_capture_observer.h",
103 "system/tray/media_security/multi_profile_media_tray_item.cc", 100 "system/tray/media_security/multi_profile_media_tray_item.cc",
104 "system/tray/media_security/multi_profile_media_tray_item.h", 101 "system/tray/media_security/multi_profile_media_tray_item.h",
102 ]
103 }
104
105 if (!use_x11 || !is_chromeos) {
106 sources -= [
105 "touch/touch_transformer_controller.cc", 107 "touch/touch_transformer_controller.cc",
106 "touch/touch_transformer_controller.h", 108 "touch/touch_transformer_controller.h",
107 ] 109 ]
108 } 110 }
109 } 111 }
110 112
111 component("ash_with_content") { 113 component("ash_with_content") {
112 sources = [ 114 sources = [
113 "content_support/ash_with_content_export.h", 115 "content_support/ash_with_content_export.h",
114 "content_support/gpu_support_impl.cc", 116 "content_support/gpu_support_impl.cc",
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 #'../components/components.gyp:user_manager', TODO(GYP) 355 #'../components/components.gyp:user_manager', TODO(GYP)
354 #'../content/content_shell_and_tests.gyp:test_support_content', TODO(GYP) 356 #'../content/content_shell_and_tests.gyp:test_support_content', TODO(GYP)
355 ] 357 ]
356 358
357 if (is_chromeos) { 359 if (is_chromeos) {
358 #deps += [ "//ui/display" ] TODO(GYP) 360 #deps += [ "//ui/display" ] TODO(GYP)
359 } 361 }
360 } 362 }
361 363
362 } # if false 364 } # if false
OLDNEW
« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698