chrome/chrome_tests.gypi - Issue 2148293003: Excluded non-chromeos source files in chromeos build

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_tests.gypi

Issue 2148293003: Excluded non-chromeos source files in chromeos build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed failed test Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_tests.gypi

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi

index 2cc06448256665ffc1f7671ebdf9c75b9892127d..10f031d4dc7c11ca675e3076303328b9488c9c24 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -883,7 +883,7 @@

'browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc',

'browser/ui/webui/options/chromeos/shared_options_browsertest.cc',

- 'chrome_browser_tests_views_non_cros_or_mac_sources': [

+ 'chrome_browser_tests_views_non_cros_sources': [

# This should be brought up on OSX Views but not CrOS.

'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',

@@ -2648,8 +2648,8 @@

['toolkit_views==1 and OS!="mac"', {

'sources': [ '<@(chrome_browser_tests_views_non_mac_sources)' ],

}],

- ['toolkit_views==1 and OS!="mac" and chromeos == 0', {

- 'sources': [ '<@(chrome_browser_tests_views_non_cros_or_mac_sources)' ],

+ ['toolkit_views==1 and (OS!="mac" or mac_views_browser==1) and chromeos == 0', {

+ 'sources': [ '<@(chrome_browser_tests_views_non_cros_sources)' ],

}],

['OS=="linux" or OS=="win"', {

'sources': [ '<@(chrome_browser_tests_non_mac_desktop_sources)' ],

« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »