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

Unified Diff: build/config/ui.gni

Issue 296933017: Introduce GN to desktop_linux arg and grit_defines list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | tools/gn/secondary/tools/grit/grit_rule.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ui.gni
diff --git a/build/config/ui.gni b/build/config/ui.gni
index 360e860ef8fbf5831efe5a588ea77646ae1928b9..dea686f1aea23a0cf27bdabdabc33be064e90178 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -12,6 +12,8 @@
# See also build/config/features.gni
declare_args() {
+ desktop_linux = is_linux && !is_chromeos
brettw 2014/05/27 23:54:23 Since it seems like we're stuck with this, can you
tfarina 2014/05/30 03:02:07 Done.
+
# Indicates if Ash is enabled. Ash is the Aura Shell which provides a
# desktop-like environment for Aura. Requires use_aura = true
use_ash = is_win || is_chromeos
@@ -56,3 +58,12 @@ use_x11 = is_linux && !use_ozone
use_glib = is_linux
use_clipboard_aurax11 = is_linux && use_aura && use_x11
+
+grit_defines = []
tfarina 2014/05/23 19:38:37 in GYP this is declared in build/common.gypi. Whe
brettw 2014/05/27 23:51:03 I think you can just put this in the grit_rule.gni
tfarina 2014/05/30 03:02:07 Done.
+if (is_chromeos) {
+ grit_defines += [ "-D", "chromeos", "-D", "scale_factors=2x"]
+}
+
+if (desktop_linux) {
+ grit_defines += [ "-D", "desktop_linux" ]
+}
« no previous file with comments | « no previous file | tools/gn/secondary/tools/grit/grit_rule.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698