build/common.gypi - Issue 1012483004: ChromeOS implies Linux

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: build/common.gypi

Issue 1012483004: ChromeOS implies Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Simplify only one test 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:

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index b0dbfb8ac9fe134b1df5cba55e5a703e85eb3feb..9a72bb7390a66177d0328fe0b159f31f3a19e88d 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -93,8 +93,8 @@

'branding%': 'Chromium',

'conditions': [

- # ChromeOS and Windows use Aura and Ash.

- ['chromeos==1 or OS=="win" or OS=="linux"', {

+ # Windows and Linux use Aura and Ash.

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

'use_ash%': 1,

'use_aura%': 1,

}],

@@ -208,8 +208,8 @@

'toolkit_views%': 0,

}],

- # Enable HiDPI on Mac OS, Chrome OS, Windows and Linux.

- ['OS=="mac" or chromeos==1 or OS=="win" or OS=="linux"', {

+ # Enable HiDPI on Mac OS, Windows and Linux.

Nico 2015/06/06 08:01:26 nit: I'd leave the old comment

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

'enable_hidpi%': 1,

}],

« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »