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/common/features.gni") | 10 import("//chrome/common/features.gni") |
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 if (enable_nacl) { | 662 if (enable_nacl) { |
663 data_deps += [ | 663 data_deps += [ |
664 "//components/nacl/loader:nacl_helper", | 664 "//components/nacl/loader:nacl_helper", |
665 "//ppapi/native_client:irt", | 665 "//ppapi/native_client:irt", |
666 ] | 666 ] |
667 | 667 |
668 if (enable_nacl_nonsfi) { | 668 if (enable_nacl_nonsfi) { |
669 data_deps += [ "//components/nacl/loader:helper_nonsfi" ] | 669 data_deps += [ "//components/nacl/loader:helper_nonsfi" ] |
670 } | 670 } |
671 } | 671 } |
672 | |
673 if (is_chrome_branded) { | |
674 sources -= [ | |
675 # These tests are failing on official cros bots. crbug.com/431450. | |
676 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | |
677 ] | |
678 } | |
679 } else { # ! is_chromeos | 672 } else { # ! is_chromeos |
680 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform | 673 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform |
681 # panels). | 674 # panels). |
682 sources += [ | 675 sources += [ |
683 "../browser/notifications/notification_interactive_uitest.cc", | 676 "../browser/notifications/notification_interactive_uitest.cc", |
684 "../browser/notifications/notification_interactive_uitest_mac.mm", | 677 "../browser/notifications/notification_interactive_uitest_mac.mm", |
685 "../browser/notifications/notification_interactive_uitest_support.cc", | 678 "../browser/notifications/notification_interactive_uitest_support.cc", |
686 "../browser/notifications/notification_interactive_uitest_support.h", | 679 "../browser/notifications/notification_interactive_uitest_support.h", |
687 "../browser/notifications/platform_notification_service_interactive_uite
st.cc", | 680 "../browser/notifications/platform_notification_service_interactive_uite
st.cc", |
688 ] | 681 ] |
(...skipping 4369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5058 } | 5051 } |
5059 | 5052 |
5060 if (is_win) { | 5053 if (is_win) { |
5061 loadable_module("conflicts_dll") { | 5054 loadable_module("conflicts_dll") { |
5062 testonly = true | 5055 testonly = true |
5063 sources = [ | 5056 sources = [ |
5064 "conflicts/conflicts_dll.cc", | 5057 "conflicts/conflicts_dll.cc", |
5065 ] | 5058 ] |
5066 } | 5059 } |
5067 } | 5060 } |
OLD | NEW |