| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/chrome_tests.gni") | 10 import("//chrome/chrome_tests.gni") |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 ".", | 413 ".", |
| 414 "//chrome") | 414 "//chrome") |
| 415 } | 415 } |
| 416 | 416 |
| 417 if (is_chromeos) { | 417 if (is_chromeos) { |
| 418 sources += rebase_path( | 418 sources += rebase_path( |
| 419 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc
es, | 419 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc
es, |
| 420 ".", | 420 ".", |
| 421 "//chrome") | 421 "//chrome") |
| 422 sources += [ "../browser/notifications/login_state_notification_blocker_ch
romeos_browsertest.cc" ] | 422 sources += [ "../browser/notifications/login_state_notification_blocker_ch
romeos_browsertest.cc" ] |
| 423 sources -= [ | |
| 424 # Use only the _chromeos version on ChromeOS. | |
| 425 "base/view_event_test_platform_part_ash.cc", | |
| 426 ] | |
| 427 | 423 |
| 428 deps += [ | 424 deps += [ |
| 429 "//ash/resources", | 425 "//ash/resources", |
| 430 "//chromeos", | 426 "//chromeos", |
| 431 ] | 427 ] |
| 432 | 428 |
| 433 if (enable_nacl) { | 429 if (enable_nacl) { |
| 434 deps += [ | 430 deps += [ |
| 435 "//components/nacl:nacl_helper", | 431 "//components/nacl:nacl_helper", |
| 436 # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP) | 432 # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP) |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 data_deps += [ "//tools/xdisplaycheck" ] | 502 data_deps += [ "//tools/xdisplaycheck" ] |
| 507 } | 503 } |
| 508 | 504 |
| 509 if (enable_app_list) { | 505 if (enable_app_list) { |
| 510 sources += rebase_path( | 506 sources += rebase_path( |
| 511 chrome_tests_gypi_values.chrome_interactive_ui_test_app_list_sourc
es, | 507 chrome_tests_gypi_values.chrome_interactive_ui_test_app_list_sourc
es, |
| 512 ".", | 508 ".", |
| 513 "//chrome") | 509 "//chrome") |
| 514 } | 510 } |
| 515 | 511 |
| 512 if (!use_aura) { |
| 513 sources -= [ |
| 514 "base/interactive_test_utils_aura.cc", |
| 515 "base/interactive_test_utils_aura.h", |
| 516 ] |
| 517 } |
| 518 |
| 516 if (use_ash) { | 519 if (use_ash) { |
| 517 sources += rebase_path( | 520 sources += rebase_path( |
| 518 chrome_tests_gypi_values.chrome_interactive_ui_test_ash_sources, | 521 chrome_tests_gypi_values.chrome_interactive_ui_test_ash_sources, |
| 519 ".", | 522 ".", |
| 520 "//chrome") | 523 "//chrome") |
| 524 if (is_chromeos) { |
| 525 sources -= [ |
| 526 # Use only the _chromeos version on ChromeOS. |
| 527 "base/view_event_test_platform_part_ash.cc", |
| 528 ] |
| 529 } |
| 521 deps += [ "//ash:interactive_ui_test_support" ] | 530 deps += [ "//ash:interactive_ui_test_support" ] |
| 522 } | 531 } |
| 523 | 532 |
| 524 if (enable_notifications) { | 533 if (enable_notifications) { |
| 525 sources += rebase_path( | 534 sources += rebase_path( |
| 526 chrome_tests_gypi_values.chrome_interactive_ui_test_notifications_
sources, | 535 chrome_tests_gypi_values.chrome_interactive_ui_test_notifications_
sources, |
| 527 ".", | 536 ".", |
| 528 "//chrome") | 537 "//chrome") |
| 529 | 538 |
| 530 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform | 539 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 976 data_deps += [ | 985 data_deps += [ |
| 977 "//components/nacl:nacl_helper", | 986 "//components/nacl:nacl_helper", |
| 978 # "//components/nacl_nonsfi.gyp:nacl_helper_nonsfi", # TODO(GYP) bug
512912. | 987 # "//components/nacl_nonsfi.gyp:nacl_helper_nonsfi", # TODO(GYP) bug
512912. |
| 979 ] | 988 ] |
| 980 } | 989 } |
| 981 } | 990 } |
| 982 if (debug_devtools) { | 991 if (debug_devtools) { |
| 983 defines += [ "DEBUG_DEVTOOLS=1" ] | 992 defines += [ "DEBUG_DEVTOOLS=1" ] |
| 984 } | 993 } |
| 985 if (use_ash) { | 994 if (use_ash) { |
| 995 sources += |
| 996 rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources, |
| 997 ".", |
| 998 "//chrome") |
| 986 deps += [ "//ash:test_support" ] | 999 deps += [ "//ash:test_support" ] |
| 987 } | 1000 } |
| 988 if (use_aura || toolkit_views) { | 1001 if (use_aura || toolkit_views) { |
| 989 deps += [ "//ui/events:test_support" ] | 1002 deps += [ "//ui/events:test_support" ] |
| 990 } | 1003 } |
| 991 if (toolkit_views) { | 1004 if (toolkit_views) { |
| 992 sources += rebase_path( | 1005 sources += rebase_path( |
| 993 chrome_tests_gypi_values.chrome_browser_tests_views_sources, | 1006 chrome_tests_gypi_values.chrome_browser_tests_views_sources, |
| 994 ".", | 1007 ".", |
| 995 "//chrome") | 1008 "//chrome") |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1027 "//ui/login:resources", | 1040 "//ui/login:resources", |
| 1028 ] | 1041 ] |
| 1029 } else { | 1042 } else { |
| 1030 sources -= [ | 1043 sources -= [ |
| 1031 "../browser/extensions/api/enterprise_device_attributes/enterprise_devic
e_attributes_apitest.cc", | 1044 "../browser/extensions/api/enterprise_device_attributes/enterprise_devic
e_attributes_apitest.cc", |
| 1032 "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_
keys_apitest_nss.cc", | 1045 "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_
keys_apitest_nss.cc", |
| 1033 "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc", | 1046 "../browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc", |
| 1034 "../browser/extensions/api/terminal/terminal_private_apitest.cc", | 1047 "../browser/extensions/api/terminal/terminal_private_apitest.cc", |
| 1035 "../browser/invalidation/profile_invalidation_provider_factory_browserte
st.cc", | 1048 "../browser/invalidation/profile_invalidation_provider_factory_browserte
st.cc", |
| 1036 "../browser/net/nss_context_chromeos_browsertest.cc", | 1049 "../browser/net/nss_context_chromeos_browsertest.cc", |
| 1037 "../browser/ui/ash/keyboard_controller_browsertest.cc", | |
| 1038 "data/webui/certificate_viewer_ui_test-inl.h", | 1050 "data/webui/certificate_viewer_ui_test-inl.h", |
| 1039 ] | 1051 ] |
| 1052 if (use_ash) { |
| 1053 sources -= [ "../browser/ui/ash/keyboard_controller_browsertest.cc" ] |
| 1054 } |
| 1040 if (toolkit_views) { | 1055 if (toolkit_views) { |
| 1041 sources -= [ "../browser/ui/views/select_file_dialog_extension_browserte
st.cc" ] | 1056 sources -= [ "../browser/ui/views/select_file_dialog_extension_browserte
st.cc" ] |
| 1042 } | 1057 } |
| 1043 } | 1058 } |
| 1044 if (enable_configuration_policy) { | 1059 if (enable_configuration_policy) { |
| 1045 sources += rebase_path( | 1060 sources += rebase_path( |
| 1046 chrome_tests_gypi_values.chrome_browser_tests_policy_sources, | 1061 chrome_tests_gypi_values.chrome_browser_tests_policy_sources, |
| 1047 ".", | 1062 ".", |
| 1048 "//chrome") | 1063 "//chrome") |
| 1049 } | 1064 } |
| (...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2149 "//third_party/mojo/src/mojo/edk/system", | 2164 "//third_party/mojo/src/mojo/edk/system", |
| 2150 ] | 2165 ] |
| 2151 | 2166 |
| 2152 if (!is_android && use_ash) { | 2167 if (!is_android && use_ash) { |
| 2153 sources += rebase_path( | 2168 sources += rebase_path( |
| 2154 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 2169 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
| 2155 ".", | 2170 ".", |
| 2156 "//chrome") | 2171 "//chrome") |
| 2157 } | 2172 } |
| 2158 } | 2173 } |
| OLD | NEW |