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

Unified Diff: build/common.gypi

Issue 1012483004: ChromeOS implies Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits Created 5 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
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 6d77eaa39f9b0bb42d63ecd0191d5f3b3ed8005e..8a01e0b403997aca205afe42d92ed5bd1ea14785 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -104,8 +104,8 @@
'branding%': 'Chromium',
'conditions': [
- # ChromeOS and Windows use Aura and Ash.
- ['chromeos==1 or OS=="win" or OS=="linux"', {
+ # Windows and Linux (including Chrome OS) use Aura and Ash.
+ ['OS=="win" or OS=="linux"', {
'use_ash%': 1,
'use_aura%': 1,
}],
@@ -225,8 +225,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 (including Chrome OS).
+ ['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 »

Powered by Google App Engine
This is Rietveld 408576698