Chromium Code Reviews| 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 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1015 deps += [ "//chrome/browser/chromeos" ] | 1015 deps += [ "//chrome/browser/chromeos" ] |
| 1016 data_deps += [ "//third_party/liblouis:liblouis_test_data" ] | 1016 data_deps += [ "//third_party/liblouis:liblouis_test_data" ] |
| 1017 } else if (is_linux || is_win) { | 1017 } else if (is_linux || is_win) { |
| 1018 sources += [ | 1018 sources += [ |
| 1019 "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc", | 1019 "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc", |
| 1020 "../browser/ui/views/ime/ime_window_browsertest.cc", | 1020 "../browser/ui/views/ime/ime_window_browsertest.cc", |
| 1021 ] | 1021 ] |
| 1022 } | 1022 } |
| 1023 | 1023 |
| 1024 if (is_win || is_linux) { | 1024 if (is_win || is_linux) { |
| 1025 sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] | 1025 sources += [ |
| 1026 "../browser/nacl_host/test/nacl_gdb_browsertest.cc", | |
| 1027 "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc", | |
|
Dirk Pranke
2016/05/17 00:43:48
in gyp, it looks like input_ime_apitest_nonchromeo
Nico
2016/05/17 13:53:39
Good catch! Done.
| |
| 1028 ] | |
| 1026 data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] | 1029 data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] |
| 1027 } | 1030 } |
| 1028 if (is_win) { | 1031 if (is_win) { |
| 1029 # TODO(halyavin) NaCl on Windows can't open debug stub socket in | 1032 # TODO(halyavin) NaCl on Windows can't open debug stub socket in |
| 1030 # browser process as needed by this test. See http://crbug.com/157312. | 1033 # browser process as needed by this test. See http://crbug.com/157312. |
| 1031 sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ] | 1034 sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ] |
| 1032 configs -= [ "//build/config/win:default_incremental_linking" ] | 1035 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 1033 configs += | 1036 configs += |
| 1034 [ "//build/config/win:default_large_module_incremental_linking" ] | 1037 [ "//build/config/win:default_large_module_incremental_linking" ] |
| 1035 } | 1038 } |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 1061 sources += rebase_path( | 1064 sources += rebase_path( |
| 1062 chrome_tests_gypi_values.chrome_browser_tests_views_sources, | 1065 chrome_tests_gypi_values.chrome_browser_tests_views_sources, |
| 1063 ".", | 1066 ".", |
| 1064 "//chrome") | 1067 "//chrome") |
| 1065 deps += [ "//ui/views" ] | 1068 deps += [ "//ui/views" ] |
| 1066 if (!is_mac) { | 1069 if (!is_mac) { |
| 1067 sources += rebase_path( | 1070 sources += rebase_path( |
| 1068 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour ces, | 1071 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour ces, |
| 1069 ".", | 1072 ".", |
| 1070 "//chrome") | 1073 "//chrome") |
| 1074 if (!is_chromeos) { | |
| 1075 sources += rebase_path( | |
| 1076 chrome_tests_gypi_values.chrome_browser_tests_views_non_cros_o r_mac_sources, | |
| 1077 ".", | |
| 1078 "//chrome") | |
| 1079 } | |
| 1071 } | 1080 } |
| 1072 } | 1081 } |
| 1073 | 1082 |
| 1074 if (is_linux && !is_component_build) { | 1083 if (is_linux && !is_component_build) { |
| 1075 # Set rpath to find the CDM adapter even in a non-component build. | 1084 # Set rpath to find the CDM adapter even in a non-component build. |
| 1076 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] | 1085 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] |
| 1077 } | 1086 } |
| 1078 | 1087 |
| 1079 if (is_chromeos) { | 1088 if (is_chromeos) { |
| 1080 sources += rebase_path( | 1089 sources += rebase_path( |
| (...skipping 1292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2373 if (is_android) { | 2382 if (is_android) { |
| 2374 android_library("unit_tests_java") { | 2383 android_library("unit_tests_java") { |
| 2375 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] | 2384 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] |
| 2376 deps = [ | 2385 deps = [ |
| 2377 "//base:base_java", | 2386 "//base:base_java", |
| 2378 "//chrome/android:chrome_java", | 2387 "//chrome/android:chrome_java", |
| 2379 "//content/public/android:content_java", | 2388 "//content/public/android:content_java", |
| 2380 ] | 2389 ] |
| 2381 } | 2390 } |
| 2382 } | 2391 } |
| OLD | NEW |