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

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

Issue 896033004: chrome: Fixes for Linux ChromiumOS ozone build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/browser/chromeos/BUILD.gn ('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 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 defines += [ "CLD_WINDOWS" ] 1662 defines += [ "CLD_WINDOWS" ]
1663 deps += [ "//third_party/cld" ] 1663 deps += [ "//third_party/cld" ]
1664 } 1664 }
1665 if (enable_app_list) { 1665 if (enable_app_list) {
1666 sources += 1666 sources +=
1667 rebase_path(unit_gypi_values.chrome_unit_tests_app_list_sources, 1667 rebase_path(unit_gypi_values.chrome_unit_tests_app_list_sources,
1668 ".", 1668 ".",
1669 "//chrome") 1669 "//chrome")
1670 deps += [ "//ui/app_list:test_support" ] 1670 deps += [ "//ui/app_list:test_support" ]
1671 } 1671 }
1672 if (use_ozone) { 1672 if (is_chromeos && use_ozone) {
Nico 2015/02/04 01:23:08 (gyp seems to not have the `is_chromeos &&` bit –
spang 2015/02/04 01:48:37 Hm, maybe not.
1673 # crbug.com/354036 1673 # crbug.com/354036
1674 sources -= [ "browser/chromeos/events/event_rewriter_unittest.cc" ] 1674 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ]
1675 } 1675 }
1676 if (!enable_plugin_installation) { 1676 if (!enable_plugin_installation) {
1677 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] 1677 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
1678 } 1678 }
1679 } 1679 }
1680 } 1680 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698