Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: chrome/test/BUILD.gn

Issue 2053083002: Build fixes for linux desktop CrOS builders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/BUILD.gn ('k') | chromeos/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 data += [ 352 data += [
353 "$root_out_dir/chrome_100_percent.pak", 353 "$root_out_dir/chrome_100_percent.pak",
354 "$root_out_dir/chrome_200_percent.pak", 354 "$root_out_dir/chrome_200_percent.pak",
355 "$root_out_dir/locales/en-US.pak", 355 "$root_out_dir/locales/en-US.pak",
356 "$root_out_dir/locales/fr.pak", 356 "$root_out_dir/locales/fr.pak",
357 ] 357 ]
358 } 358 }
359 if (is_linux) { 359 if (is_linux) {
360 data += [ "$root_out_dir/libppapi_tests.so" ] 360 data += [ "$root_out_dir/libppapi_tests.so" ]
361 } 361 }
362
362 if (!is_mac) { 363 if (!is_mac) {
363 data_deps += [ "//chrome:packed_extra_resources" ] 364 data_deps += [ "//chrome:packed_extra_resources" ]
364 } 365 }
365 366
366 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] 367 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
367 ldflags = [] 368 ldflags = []
368 369
369 deps = [ 370 deps = [
370 ":test_support", 371 ":test_support",
371 ":test_support_ui", 372 ":test_support_ui",
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc es, 470 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc es,
470 ".", 471 ".",
471 "//chrome") 472 "//chrome")
472 sources += [ "../browser/notifications/login_state_notification_blocker_ch romeos_browsertest.cc" ] 473 sources += [ "../browser/notifications/login_state_notification_blocker_ch romeos_browsertest.cc" ]
473 474
474 deps += [ 475 deps += [
475 "//ash/resources", 476 "//ash/resources",
476 "//chromeos", 477 "//chromeos",
477 ] 478 ]
478 479
480 data += [
481 "//chrome/browser/chromeos/login/test/https_forwarder.py",
482 "//google_apis/test/",
483 "$root_out_dir/resources/chromeos/",
484 ]
485
486 data_deps += [ "//ui/keyboard:resources" ]
487
479 if (enable_nacl) { 488 if (enable_nacl) {
480 data_deps += [ 489 data_deps += [
481 "//components/nacl/loader:nacl_helper", 490 "//components/nacl/loader:nacl_helper",
482 "//components/nacl/loader:helper_nonsfi", 491 "//components/nacl/loader:helper_nonsfi",
492 "//ppapi/native_client:irt",
483 ] 493 ]
484 } 494 }
485 495
486 if (is_chrome_branded) { 496 if (is_chrome_branded) {
487 sources -= [ 497 sources -= [
488 # These tests are failing on official cros bots. crbug.com/431450. 498 # These tests are failing on official cros bots. crbug.com/431450.
489 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", 499 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc",
490 ] 500 ]
491 } 501 }
492 } else { 502 } else {
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 ] 889 ]
880 if (is_win) { 890 if (is_win) {
881 data += [ "$root_out_dir/chrome_200_percent.pak" ] 891 data += [ "$root_out_dir/chrome_200_percent.pak" ]
882 } 892 }
883 if (is_mac) { 893 if (is_mac) {
884 data += [ 894 data += [
885 "$root_out_dir/chrome_material_100_percent.pak", 895 "$root_out_dir/chrome_material_100_percent.pak",
886 "$root_out_dir/chrome_material_200_percent.pak", 896 "$root_out_dir/chrome_material_200_percent.pak",
887 ] 897 ]
888 } 898 }
899 if (is_chromeos) {
900 data += [
901 # TODO(GYP): figure out which of these things are
902 # actually needed and also which should be pulled in via
903 # data or data_deps and through which dependencies.
904 "//chrome/browser/chromeos/login/test/https_forwarder.py",
905 "//chrome/browser/resources/chromeos/wallpaper_manager/",
906 "//chromeos/test/data/",
907 "//components/chrome_apps/webstore_widget/cws_widget/",
908 "//ui/file_manager/file_manager/",
909 "//ui/file_manager/gallery/",
910 "//ui/file_manager/image_loader/",
911 "//ui/file_manager/integration_tests/",
912 "//third_party/analytics/",
913 "//third_party/polymer/v1_0/components-chromium/polymer/",
914 "$root_out_dir/chromevox_test_data/",
915 "$root_out_dir/content_shell.pak",
916 "$root_out_dir/locales/",
917 "$root_out_dir/resources/chromeos/",
918 ]
919
920 data_deps = [
921 "//ui/keyboard:resources",
922 "//components/nacl/loader:nacl_helper",
923 "//ppapi/native_client:irt",
924 ]
925 } else {
926 data_deps = []
927 }
889 928
890 deps = [ 929 deps = [
891 ":browser_tests_js_webui", 930 ":browser_tests_js_webui",
892 ":sync_integration_test_support", 931 ":sync_integration_test_support",
893 ":test_support", 932 ":test_support",
894 ":test_support_ui", 933 ":test_support_ui",
895 "//base", 934 "//base",
896 "//base:i18n", 935 "//base:i18n",
897 "//base/test:test_support", 936 "//base/test:test_support",
898 "//chrome:browser_tests_pak", 937 "//chrome:browser_tests_pak",
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 "//ui/web_dialogs:test_support", 989 "//ui/web_dialogs:test_support",
951 "//v8", 990 "//v8",
952 ] 991 ]
953 992
954 # TODO(rockot) bug 505926: The chrome_extensions_browsertests target should 993 # TODO(rockot) bug 505926: The chrome_extensions_browsertests target should
955 # be deleted and this line removed. See the chrome_extensions_browsertests 994 # be deleted and this line removed. See the chrome_extensions_browsertests
956 # target for more. 995 # target for more.
957 deps += [ "//extensions:chrome_extensions_browsertests" ] 996 deps += [ "//extensions:chrome_extensions_browsertests" ]
958 997
959 # Runtime dependencies 998 # Runtime dependencies
960 data_deps = [ 999 data_deps += [
961 "//chrome", 1000 "//chrome",
962 "//ppapi:ppapi_tests", 1001 "//ppapi:ppapi_tests",
963 "//ppapi:power_saver_test_plugin", 1002 "//ppapi:power_saver_test_plugin",
964 "//remoting/webapp:browser_test_resources", 1003 "//remoting/webapp:browser_test_resources",
965 "//remoting/webapp:unit_tests", 1004 "//remoting/webapp:unit_tests",
966 "//third_party/mesa:osmesa", 1005 "//third_party/mesa:osmesa",
967 "//third_party/widevine/cdm:widevine_test_license_server", 1006 "//third_party/widevine/cdm:widevine_test_license_server",
968 ] 1007 ]
969 1008
970 if (!is_mac) { 1009 if (!is_mac) {
(...skipping 1422 matching lines...) Expand 10 before | Expand all | Expand 10 after
2393 if (is_android) { 2432 if (is_android) {
2394 android_library("unit_tests_java") { 2433 android_library("unit_tests_java") {
2395 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2434 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2396 deps = [ 2435 deps = [
2397 "//base:base_java", 2436 "//base:base_java",
2398 "//chrome/android:chrome_java", 2437 "//chrome/android:chrome_java",
2399 "//content/public/android:content_java", 2438 "//content/public/android:content_java",
2400 ] 2439 ]
2401 } 2440 }
2402 } 2441 }
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698