| 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") ], |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 ] | 297 ] |
| 298 sources += [ | 298 sources += [ |
| 299 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO
(GYP) | 299 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO
(GYP) |
| 300 ] | 300 ] |
| 301 } | 301 } |
| 302 | 302 |
| 303 if (is_win) { | 303 if (is_win) { |
| 304 cflags = [ "/wd4267" ] | 304 cflags = [ "/wd4267" ] |
| 305 } | 305 } |
| 306 | 306 |
| 307 if (!use_x11 || !is_chromeos) { |
| 308 sources -= [ |
| 309 "touch/touch_transformer_controller_unittest.cc", |
| 310 ] |
| 311 } |
| 312 |
| 307 if (!use_x11) { | 313 if (!use_x11) { |
| 308 sources -= [ | 314 sources -= [ |
| 309 "accelerators/magnifier_key_scroller_unittest.cc", | 315 "accelerators/magnifier_key_scroller_unittest.cc", |
| 310 "accelerators/spoken_feedback_toggler_unittest.cc", | 316 "accelerators/spoken_feedback_toggler_unittest.cc", |
| 311 "touch/touch_transformer_controller_unittest.cc", | |
| 312 ] | 317 ] |
| 313 } | 318 } |
| 314 if (is_chromeos) { | 319 if (is_chromeos) { |
| 315 sources += [ "first_run/first_run_helper_unittest.cc" ] | 320 sources += [ "first_run/first_run_helper_unittest.cc" ] |
| 316 deps += [ | 321 deps += [ |
| 317 "//device/bluetooth", | 322 "//device/bluetooth", |
| 318 "//ui/display", | 323 "//ui/display", |
| 319 "//ui/display:test_util", | 324 "//ui/display:test_util", |
| 320 "//ui/display/types", | 325 "//ui/display/types", |
| 321 #'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', TODO(GYP
) | 326 #'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', TODO(GYP
) |
| 322 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP) | 327 #'../chromeos/chromeos.gyp:power_manager_proto', TODO(GYP) |
| 323 ] | 328 ] |
| 324 } else { | 329 } else { |
| 325 sources -= [ | 330 sources -= [ |
| 326 "display/resolution_notification_controller_unittest.cc", | 331 "display/resolution_notification_controller_unittest.cc", |
| 327 "touch/touch_transformer_controller_unittest.cc", | |
| 328 "touch/touchscreen_util_unittest.cc", | 332 "touch/touchscreen_util_unittest.cc", |
| 329 ] | 333 ] |
| 330 } | 334 } |
| 331 | 335 |
| 332 # TODO(GYP) is this necessary? | 336 # TODO(GYP) is this necessary? |
| 333 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { | 337 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { |
| 334 # ldflags = "-rdynamic" | 338 # ldflags = "-rdynamic" |
| 335 | 339 |
| 336 if (use_ozone) { | 340 if (use_ozone) { |
| 337 sources -= [ | 341 sources -= [ |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 "//content/test:test_support", | 384 "//content/test:test_support", |
| 381 "//skia", | 385 "//skia", |
| 382 "//testing/gtest", | 386 "//testing/gtest", |
| 383 "//ui/accessibility", | 387 "//ui/accessibility", |
| 384 ] | 388 ] |
| 385 | 389 |
| 386 if (is_chromeos) { | 390 if (is_chromeos) { |
| 387 deps += [ "//ui/display" ] | 391 deps += [ "//ui/display" ] |
| 388 } | 392 } |
| 389 } | 393 } |
| OLD | NEW |