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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 "//chrome/browser/chromeos/login/test/https_forwarder.py", | 515 "//chrome/browser/chromeos/login/test/https_forwarder.py", |
516 "//google_apis/test/", | 516 "//google_apis/test/", |
517 "$root_out_dir/resources/chromeos/", | 517 "$root_out_dir/resources/chromeos/", |
518 ] | 518 ] |
519 | 519 |
520 data_deps += [ "//ui/keyboard:resources" ] | 520 data_deps += [ "//ui/keyboard:resources" ] |
521 | 521 |
522 if (enable_nacl) { | 522 if (enable_nacl) { |
523 data_deps += [ | 523 data_deps += [ |
524 "//components/nacl/loader:nacl_helper", | 524 "//components/nacl/loader:nacl_helper", |
525 "//components/nacl/loader:helper_nonsfi", | |
526 "//ppapi/native_client:irt", | 525 "//ppapi/native_client:irt", |
527 ] | 526 ] |
| 527 |
| 528 if (enable_nacl_nonsfi) { |
| 529 data_deps += [ "//components/nacl/loader:helper_nonsfi" ] |
| 530 } |
528 } | 531 } |
529 | 532 |
530 if (is_chrome_branded) { | 533 if (is_chrome_branded) { |
531 sources -= [ | 534 sources -= [ |
532 # These tests are failing on official cros bots. crbug.com/431450. | 535 # These tests are failing on official cros bots. crbug.com/431450. |
533 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | 536 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", |
534 ] | 537 ] |
535 } | 538 } |
536 } else { | 539 } else { |
537 # ChromeOS doesn't use panels, everybody else does. | 540 # ChromeOS doesn't use panels, everybody else does. |
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1133 } | 1136 } |
1134 if (is_win) { | 1137 if (is_win) { |
1135 # TODO(halyavin) NaCl on Windows can't open debug stub socket in | 1138 # TODO(halyavin) NaCl on Windows can't open debug stub socket in |
1136 # browser process as needed by this test. See http://crbug.com/157312. | 1139 # browser process as needed by this test. See http://crbug.com/157312. |
1137 sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ] | 1140 sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ] |
1138 configs -= [ "//build/config/win:default_incremental_linking" ] | 1141 configs -= [ "//build/config/win:default_incremental_linking" ] |
1139 configs += | 1142 configs += |
1140 [ "//build/config/win:default_large_module_incremental_linking" ] | 1143 [ "//build/config/win:default_large_module_incremental_linking" ] |
1141 } | 1144 } |
1142 if (is_linux) { | 1145 if (is_linux) { |
1143 data_deps += [ | 1146 data_deps += [ "//components/nacl/loader:nacl_helper" ] |
1144 "//components/nacl/loader:nacl_helper", | 1147 |
1145 "//components/nacl/loader:helper_nonsfi", | 1148 if (enable_nacl_nonsfi) { |
1146 ] | 1149 data_deps += [ "//components/nacl/loader:helper_nonsfi" ] |
| 1150 } |
1147 } | 1151 } |
1148 } | 1152 } |
1149 | 1153 |
1150 if (enable_extensions) { | 1154 if (enable_extensions) { |
1151 sources += rebase_path( | 1155 sources += rebase_path( |
1152 chrome_tests_gypi_values.chrome_browser_extensions_test_support_so
urces, | 1156 chrome_tests_gypi_values.chrome_browser_extensions_test_support_so
urces, |
1153 ".", | 1157 ".", |
1154 "//chrome") | 1158 "//chrome") |
1155 | 1159 |
1156 deps += [ | 1160 deps += [ |
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2497 if (is_android) { | 2501 if (is_android) { |
2498 android_library("unit_tests_java") { | 2502 android_library("unit_tests_java") { |
2499 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] | 2503 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap
k/ChromeNativeTestApplication.java" ] |
2500 deps = [ | 2504 deps = [ |
2501 "//base:base_java", | 2505 "//base:base_java", |
2502 "//chrome/android:chrome_java", | 2506 "//chrome/android:chrome_java", |
2503 "//content/public/android:content_java", | 2507 "//content/public/android:content_java", |
2504 ] | 2508 ] |
2505 } | 2509 } |
2506 } | 2510 } |
OLD | NEW |