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

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

Issue 1003853005: Remove Chrome OS-only sources only if the OS is Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the workaround for bug 362698. Created 5 years, 9 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 | « chrome/chrome_tests_unit.gypi ('k') | no next file » | 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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 10
(...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 # These tests depend on single process mode, which is disabled in 990 # These tests depend on single process mode, which is disabled in
991 # official builds. 991 # official builds.
992 "../renderer/safe_browsing/phishing_classifier_browsertest.cc", 992 "../renderer/safe_browsing/phishing_classifier_browsertest.cc",
993 "../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc", 993 "../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc",
994 "../renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc ", 994 "../renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc ",
995 ] 995 ]
996 } 996 }
997 if (!enable_autofill_dialog || is_android || is_ios) { 997 if (!enable_autofill_dialog || is_android || is_ios) {
998 deps -= [ "//third_party/libaddressinput" ] 998 deps -= [ "//third_party/libaddressinput" ]
999 } 999 }
1000 if (use_ozone) {
1001 sources -= [
1002 # crbug.com/362698
1003 "../browser/chromeos/input_method/input_method_engine_browsertests.cc",
1004 "../browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc",
1005 ]
1006 }
1007 if (enable_remoting) { 1000 if (enable_remoting) {
1008 sources += rebase_path( 1001 sources += rebase_path(
1009 chrome_tests_gypi_values.chrome_browser_tests_remoting_sources, 1002 chrome_tests_gypi_values.chrome_browser_tests_remoting_sources,
1010 ".", 1003 ".",
1011 "//chrome") 1004 "//chrome")
1012 #deps += [ "//remoting:remoting_webapp" ] TODO(GYP) 1005 #deps += [ "//remoting:remoting_webapp" ] TODO(GYP)
1013 } 1006 }
1014 if (use_x11) { 1007 if (use_x11) {
1015 deps += [ "//tools/xdisplaycheck" ] 1008 deps += [ "//tools/xdisplaycheck" ]
1016 } 1009 }
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1496 "//ash/resources", 1489 "//ash/resources",
1497 "//ui/chromeos/resources", 1490 "//ui/chromeos/resources",
1498 ] 1491 ]
1499 sources -= [ 1492 sources -= [
1500 "../browser/signin/signin_global_error_unittest.cc", 1493 "../browser/signin/signin_global_error_unittest.cc",
1501 "../browser/signin/signin_manager_unittest.cc", 1494 "../browser/signin/signin_manager_unittest.cc",
1502 "../browser/signin/signin_names_io_thread_unittest.cc", 1495 "../browser/signin/signin_names_io_thread_unittest.cc",
1503 "../browser/ui/views/app_list/linux/app_list_linux_unittest.cc", 1496 "../browser/ui/views/app_list/linux/app_list_linux_unittest.cc",
1504 "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc" , 1497 "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc" ,
1505 ] 1498 ]
1499 if (use_ozone) {
1500 # crbug.com/354036
1501 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ]
1502 }
1506 } 1503 }
1507 if (use_x11) { 1504 if (use_x11) {
1508 deps += [ "//ui/events/devices" ] 1505 deps += [ "//ui/events/devices" ]
1509 data_deps += [ "//tools/xdisplaycheck" ] 1506 data_deps += [ "//tools/xdisplaycheck" ]
1510 } else { 1507 } else {
1511 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] 1508 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
1512 } 1509 }
1513 if (cld_version == 0 || cld_version == 2) { 1510 if (cld_version == 0 || cld_version == 2) {
1514 # Unit tests should be independent of the CLD2 access mechanism, just use 1511 # Unit tests should be independent of the CLD2 access mechanism, just use
1515 # static for simplicity. 1512 # static for simplicity.
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 defines += [ "CLD_WINDOWS" ] 1658 defines += [ "CLD_WINDOWS" ]
1662 deps += [ "//third_party/cld" ] 1659 deps += [ "//third_party/cld" ]
1663 } 1660 }
1664 if (enable_app_list) { 1661 if (enable_app_list) {
1665 sources += 1662 sources +=
1666 rebase_path(unit_gypi_values.chrome_unit_tests_app_list_sources, 1663 rebase_path(unit_gypi_values.chrome_unit_tests_app_list_sources,
1667 ".", 1664 ".",
1668 "//chrome") 1665 "//chrome")
1669 deps += [ "//ui/app_list:test_support" ] 1666 deps += [ "//ui/app_list:test_support" ]
1670 } 1667 }
1671 if (use_ozone) {
1672 # crbug.com/354036
1673 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ]
1674 }
1675 if (!enable_plugin_installation) { 1668 if (!enable_plugin_installation) {
1676 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] 1669 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
1677 } 1670 }
1678 } 1671 }
1679 1672
1680 if (is_linux && !is_chromeos) { 1673 if (is_linux && !is_chromeos) {
1681 # TODO(GYP): Figure out which of these work and are needed on other 1674 # TODO(GYP): Figure out which of these work and are needed on other
1682 # platforms. 1675 # platforms.
1683 test("chrome_app_unittests") { 1676 test("chrome_app_unittests") {
1684 sources = [ 1677 sources = [
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1737 # ] 1730 # ]
1738 # } 1731 # }
1739 # if (!is_mac) { 1732 # if (!is_mac) {
1740 # sources -= [ 1733 # sources -= [
1741 # "perf/mach_ports_performancetest.cc", 1734 # "perf/mach_ports_performancetest.cc",
1742 # ] 1735 # ]
1743 # } 1736 # }
1744 # } 1737 # }
1745 } 1738 }
1746 } 1739 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698