| OLD | NEW |
| 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") ], |
| 11 "scope", | 11 "scope", |
| 12 [ "ash.gyp" ]) | 12 [ "ash.gyp" ]) |
| 13 | 13 |
| 14 component("ash") { | 14 component("ash") { |
| 15 sources = gypi_values.ash_sources | 15 sources = gypi_values.ash_sources |
| 16 | 16 |
| 17 defines = [ "ASH_IMPLEMENTATION" ] | 17 defines = [ "ASH_IMPLEMENTATION" ] |
| 18 | 18 |
| 19 deps = [ | 19 deps = [ |
| 20 "//ash/resources", | 20 "//ash/resources", |
| 21 "//ash/strings", | 21 "//ash/strings", |
| 22 "//base", | 22 "//base", |
| 23 "//base:i18n", | 23 "//base:i18n", |
| 24 "//base/third_party/dynamic_annotations", | 24 "//base/third_party/dynamic_annotations", |
| 25 "//cc", | 25 "//cc", |
| 26 "//content/public/browser", | 26 "//content/public/browser", |
| 27 "//media", |
| 27 "//net", | 28 "//net", |
| 28 "//skia", | 29 "//skia", |
| 29 "//third_party/icu", | 30 "//third_party/icu", |
| 30 "//ui/accessibility", | 31 "//ui/accessibility", |
| 32 "//ui/app_list", |
| 31 "//ui/aura", | 33 "//ui/aura", |
| 32 "//ui/base", | 34 "//ui/base", |
| 33 "//ui/compositor", | 35 "//ui/compositor", |
| 34 "//ui/events", | 36 "//ui/events", |
| 35 "//ui/events:events_base", | 37 "//ui/events:events_base", |
| 36 "//ui/gfx", | 38 "//ui/gfx", |
| 37 "//ui/gfx/geometry", | 39 "//ui/gfx/geometry", |
| 38 "//ui/keyboard", | 40 "//ui/keyboard", |
| 41 "//ui/message_center", |
| 39 "//ui/resources", | 42 "//ui/resources", |
| 40 "//ui/strings", | 43 "//ui/strings", |
| 44 "//ui/views", |
| 45 "//ui/views/controls/webview", |
| 41 "//ui/web_dialogs", | 46 "//ui/web_dialogs", |
| 42 "//ui/wm", | 47 "//ui/wm", |
| 43 "//url", | 48 "//url", |
| 44 #'../components/components.gyp:user_manager', TODO(GYP) | 49 #'../components/components.gyp:user_manager', TODO(GYP) |
| 45 #'../media/media.gyp:media', TODO(GYP) | |
| 46 #"//ui/app_list", TODO(GYP) | |
| 47 #'../ui/message_center/message_center.gyp:message_center', TODO(GYP) | |
| 48 #'../ui/views/controls/webview/webview.gyp:webview', 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 "sticky_keys/sticky_keys_controller.cc", | 59 "sticky_keys/sticky_keys_controller.cc", |
| (...skipping 13 matching lines...) Expand all Loading... |
| 73 "accelerators/key_hold_detector.h", | 73 "accelerators/key_hold_detector.h", |
| 74 "accelerators/magnifier_key_scroller.cc", | 74 "accelerators/magnifier_key_scroller.cc", |
| 75 "accelerators/magnifier_key_scroller.h", | 75 "accelerators/magnifier_key_scroller.h", |
| 76 "accelerators/spoken_feedback_toggler.cc", | 76 "accelerators/spoken_feedback_toggler.cc", |
| 77 "accelerators/spoken_feedback_toggler.h", | 77 "accelerators/spoken_feedback_toggler.h", |
| 78 ] | 78 ] |
| 79 } | 79 } |
| 80 | 80 |
| 81 if (is_chromeos) { | 81 if (is_chromeos) { |
| 82 deps += [ | 82 deps += [ |
| 83 "//device/bluetooth", |
| 84 "//ui/display", |
| 85 "//ui/display/util", |
| 83 #'../chromeos/chromeos.gyp:chromeos', TODO(GYP) | 86 #'../chromeos/chromeos.gyp:chromeos', TODO(GYP) |
| 84 # Ash #includes power_supply_properties.pb.h directly. | 87 # Ash #includes power_supply_properties.pb.h directly. |
| 85 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP) | 88 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP) |
| 86 #'../device/bluetooth/bluetooth.gyp:device_bluetooth', TODO(GYP) | |
| 87 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', TODO(GYP) | 89 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', TODO(GYP) |
| 88 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', TODO(GYP) | 90 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', TODO(GYP) |
| 89 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos', TODO(GYP) | 91 #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos', TODO(GYP) |
| 90 #'../ui/display/display.gyp:display', TODO(GYP) | |
| 91 #'../ui/display/display.gyp:display_util', TODO(GYP) | |
| 92 ] | 92 ] |
| 93 } else { | 93 } else { |
| 94 sources -= [ | 94 sources -= [ |
| 95 "display/display_configurator_animation.cc", | 95 "display/display_configurator_animation.cc", |
| 96 "display/display_configurator_animation.h", | 96 "display/display_configurator_animation.h", |
| 97 "display/resolution_notification_controller.cc", | 97 "display/resolution_notification_controller.cc", |
| 98 "display/resolution_notification_controller.h", | 98 "display/resolution_notification_controller.h", |
| 99 "system/tray/media_security/media_capture_observer.h", | 99 "system/tray/media_security/media_capture_observer.h", |
| 100 "system/tray/media_security/multi_profile_media_tray_item.cc", | 100 "system/tray/media_security/multi_profile_media_tray_item.cc", |
| 101 "system/tray/media_security/multi_profile_media_tray_item.h", | 101 "system/tray/media_security/multi_profile_media_tray_item.h", |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 | 153 |
| 154 static_library("test_support") { | 154 static_library("test_support") { |
| 155 sources = gypi_values.ash_test_support_sources | 155 sources = gypi_values.ash_test_support_sources |
| 156 | 156 |
| 157 deps = [ | 157 deps = [ |
| 158 ":ash", | 158 ":ash", |
| 159 "//ash/resources", | 159 "//ash/resources", |
| 160 "//skia", | 160 "//skia", |
| 161 "//testing/gtest", | 161 "//testing/gtest", |
| 162 "//ui/accessibility", | 162 "//ui/accessibility", |
| 163 #"//ui/app_list", TODO(GYP) | 163 "//ui/app_list", |
| 164 #"//ui/views", TODO(GYP) | 164 "//ui/views", |
| 165 ] | 165 ] |
| 166 | 166 |
| 167 if (is_win) { | 167 if (is_win) { |
| 168 sources += [ | 168 sources += [ |
| 169 "test/test_metro_viewer_process_host.cc", | 169 "test/test_metro_viewer_process_host.cc", |
| 170 "test/test_metro_viewer_process_host.h", | 170 "test/test_metro_viewer_process_host.h", |
| 171 ] | 171 ] |
| 172 deps += [ | 172 deps += [ |
| 173 "//ipc", | 173 "//ipc", |
| 174 #'../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', TODO(GYP) | 174 #'../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', TODO(GYP) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 187 ":ash_with_content", | 187 ":ash_with_content", |
| 188 ":test_support", | 188 ":test_support", |
| 189 "//ash/resources", | 189 "//ash/resources", |
| 190 "//ash/strings", | 190 "//ash/strings", |
| 191 "//base", | 191 "//base", |
| 192 "//base:i18n", | 192 "//base:i18n", |
| 193 #"//chrome:packed_resources", TODO(GYP) | 193 #"//chrome:packed_resources", TODO(GYP) |
| 194 "//content", | 194 "//content", |
| 195 "//skia", | 195 "//skia", |
| 196 "//third_party/icu", | 196 "//third_party/icu", |
| 197 #"//ui/app_list", TODO(GYP) | 197 "//ui/app_list", |
| 198 "//ui/aura", | 198 "//ui/aura", |
| 199 "//ui/base", | 199 "//ui/base", |
| 200 "//ui/compositor", | 200 "//ui/compositor", |
| 201 "//ui/events", | 201 "//ui/events", |
| 202 "//ui/gfx", | 202 "//ui/gfx", |
| 203 "//ui/gfx/geometry", | 203 "//ui/gfx/geometry", |
| 204 "//ui/keyboard", | 204 "//ui/keyboard", |
| 205 #"//ui/message_center", TODO(GYP) | 205 "//ui/message_center", |
| 206 "//ui/resources", | 206 "//ui/resources", |
| 207 "//ui/views", |
| 208 "//ui/views:test_support", |
| 207 #'../content/content_shell_and_tests.gyp:content_shell_lib', TODO(GYP) | 209 #'../content/content_shell_and_tests.gyp:content_shell_lib', TODO(GYP) |
| 208 #'../ui/views/examples/examples.gyp:views_examples_lib', TODO(GYP) | 210 #'../ui/views/examples/examples.gyp:views_examples_lib', TODO(GYP) |
| 209 #'../ui/views/examples/examples.gyp:views_examples_with_content_lib', TODO(
GYP) | 211 #'../ui/views/examples/examples.gyp:views_examples_with_content_lib', TODO(
GYP) |
| 210 #'../ui/views/views.gyp:views', TODO(GYP) | |
| 211 #'../ui/views/views.gyp:views_test_support', TODO(GYP) | |
| 212 ] | 212 ] |
| 213 } | 213 } |
| 214 | 214 |
| 215 if (false) { # TODO(GYP) enable ash shell and unit tests when they link. | 215 if (false) { # TODO(GYP) enable ash shell and unit tests when they link. |
| 216 | 216 |
| 217 test("ash_unittests") { | 217 test("ash_unittests") { |
| 218 sources = gypi_values.ash_unittests_sources | 218 sources = gypi_values.ash_unittests_sources |
| 219 | 219 |
| 220 deps = [ | 220 deps = [ |
| 221 ":ash", | 221 ":ash", |
| (...skipping 14 matching lines...) Expand all Loading... |
| 236 "//ui/base", | 236 "//ui/base", |
| 237 "//ui/base:test_support", | 237 "//ui/base:test_support", |
| 238 "//ui/compositor", | 238 "//ui/compositor", |
| 239 "//ui/compositor:test_support", | 239 "//ui/compositor:test_support", |
| 240 "//ui/events", | 240 "//ui/events", |
| 241 "//ui/events:test_support", | 241 "//ui/events:test_support", |
| 242 "//ui/events:gesture_detection", | 242 "//ui/events:gesture_detection", |
| 243 "//ui/gfx", | 243 "//ui/gfx", |
| 244 "//ui/gfx/geometry", | 244 "//ui/gfx/geometry", |
| 245 "//ui/keyboard", | 245 "//ui/keyboard", |
| 246 "//ui/message_center", |
| 247 "//ui/message_center:test_support", |
| 246 "//ui/resources", | 248 "//ui/resources", |
| 249 "//ui/views", |
| 250 "//ui/views:test_support", |
| 251 "//ui/views/controls/webview:test_support", |
| 247 "//ui/web_dialogs", | 252 "//ui/web_dialogs", |
| 248 "//ui/wm", | 253 "//ui/wm", |
| 249 "//url", | 254 "//url", |
| 250 #'../components/components.gyp:user_manager', TODO(GYP) | 255 #'../components/components.gyp:user_manager', TODO(GYP) |
| 251 #'../content/content_shell_and_tests.gyp:test_support_content', TODO(GYP) | 256 #'../content/content_shell_and_tests.gyp:test_support_content', TODO(GYP) |
| 252 #'../ui/message_center/message_center.gyp:message_center', TODO(GYP) | |
| 253 #'../ui/message_center/message_center.gyp:message_center_test_support', TOD
O(GYP) | |
| 254 #'../ui/views/controls/webview/webview_tests.gyp:webview_test_support', TOD
O(GYP) | |
| 255 #'../ui/views/views.gyp:views', TODO(GYP) | |
| 256 #'../ui/views/views.gyp:views_test_support', TODO(GYP) | |
| 257 ] | 257 ] |
| 258 | 258 |
| 259 if (!is_chromeos) { | 259 if (!is_chromeos) { |
| 260 sources -= [ | 260 sources -= [ |
| 261 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 | 261 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 |
| 262 "focus_cycler_unittest.cc", | 262 "focus_cycler_unittest.cc", |
| 263 # All tests for multiple displays: not supported on Windows Ash. | 263 # All tests for multiple displays: not supported on Windows Ash. |
| 264 "accelerators/nested_dispatcher_controller_unittest.cc", | 264 "accelerators/nested_dispatcher_controller_unittest.cc", |
| 265 "wm/drag_window_resizer_unittest.cc", | 265 "wm/drag_window_resizer_unittest.cc", |
| 266 # Can't resize on Windows Ash. http://crbug.com/165962 | 266 # Can't resize on Windows Ash. http://crbug.com/165962 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 284 if (!use_x11) { | 284 if (!use_x11) { |
| 285 sources -= [ | 285 sources -= [ |
| 286 "accelerators/magnifier_key_scroller_unittest.cc", | 286 "accelerators/magnifier_key_scroller_unittest.cc", |
| 287 "accelerators/spoken_feedback_toggler_unittest.cc", | 287 "accelerators/spoken_feedback_toggler_unittest.cc", |
| 288 "touch/touch_transformer_controller_unittest.cc", | 288 "touch/touch_transformer_controller_unittest.cc", |
| 289 ] | 289 ] |
| 290 } | 290 } |
| 291 if (is_chromeos) { | 291 if (is_chromeos) { |
| 292 sources += [ "first_run/first_run_helper_unittest.cc" ] | 292 sources += [ "first_run/first_run_helper_unittest.cc" ] |
| 293 deps += [ | 293 deps += [ |
| 294 "//device/bluetooth", |
| 295 "//ui/display", |
| 296 "//ui/display:test_util", |
| 297 "//ui/display/types", |
| 294 #'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', TODO(GYP
) | 298 #'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', TODO(GYP
) |
| 295 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP) | 299 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP) |
| 296 #'../device/bluetooth/bluetooth.gyp:device_bluetooth', TODO(GYP) | |
| 297 #'../ui/display/display.gyp:display', TODO(GYP) | |
| 298 #'../ui/display/display.gyp:display_test_util', TODO(GYP) | |
| 299 #'../ui/display/display.gyp:display_types', TODO(GYP) | |
| 300 ] | 300 ] |
| 301 } else { | 301 } else { |
| 302 sources -= [ | 302 sources -= [ |
| 303 "display/resolution_notification_controller_unittest.cc", | 303 "display/resolution_notification_controller_unittest.cc", |
| 304 "touch/touch_transformer_controller_unittest.cc", | 304 "touch/touch_transformer_controller_unittest.cc", |
| 305 ] | 305 ] |
| 306 } | 306 } |
| 307 | 307 |
| 308 # TODO(GYP) is this necessary? | 308 # TODO(GYP) is this necessary? |
| 309 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { | 309 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 deps = [ | 350 deps = [ |
| 351 "//base/test:test_support", | 351 "//base/test:test_support", |
| 352 "//skia", | 352 "//skia", |
| 353 "//testing/gtest", | 353 "//testing/gtest", |
| 354 "//ui/aaccessibility", | 354 "//ui/aaccessibility", |
| 355 #'../components/components.gyp:user_manager', TODO(GYP) | 355 #'../components/components.gyp:user_manager', TODO(GYP) |
| 356 #'../content/content_shell_and_tests.gyp:test_support_content', TODO(GYP) | 356 #'../content/content_shell_and_tests.gyp:test_support_content', TODO(GYP) |
| 357 ] | 357 ] |
| 358 | 358 |
| 359 if (is_chromeos) { | 359 if (is_chromeos) { |
| 360 #deps += [ "//ui/display" ] TODO(GYP) | 360 deps += [ "//ui/display" ] |
| 361 } | 361 } |
| 362 } | 362 } |
| 363 | 363 |
| 364 } # if false | 364 } # if false |
| OLD | NEW |