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

Unified Diff: tools/gn/secondary/tools/grit/grit_rule.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: rm TODO 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 | « build/config/BUILDCONFIG.gn ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/secondary/tools/grit/grit_rule.gni
diff --git a/tools/gn/secondary/tools/grit/grit_rule.gni b/tools/gn/secondary/tools/grit/grit_rule.gni
index 31307e4184471b0087932d7cf601b412d1d3e88a..c3e0a5c41ad46bf8f67218dfac3356fe3b059d0b 100644
--- a/tools/gn/secondary/tools/grit/grit_rule.gni
+++ b/tools/gn/secondary/tools/grit/grit_rule.gni
@@ -12,6 +12,28 @@
# # You can also put deps here if the grit source depends on generated
# # files.
# }
+import ("//build/config/ui.gni")
+
+grit_defines = []
+
+if (is_chromeos) {
+ grit_defines += [
+ "-D", "chromeos",
+ "-D", "scale_factors=2x"
+ ]
+}
+
+if (is_desktop_linux) {
+ grit_defines += [ "-D", "desktop_linux" ]
+}
+
+if (is_android) {
+ grit_defines += [
+ "-t", "android",
+ "-E", "ANDROID_JAVA_TAGGED_ONLY=true",
+ ]
+}
+
template("grit") {
assert(defined(invoker.source),
"\"source\" must be defined for the grit template $target_name")
@@ -70,12 +92,11 @@ template("grit") {
source_prereqs = grit_inputs
outputs = grit_outputs
- # TODO(brettw) grit_defines.
args = [
"-i", source_path, "build",
"-f", resource_ids,
"-o", output_dir,
- ] + grit_flags
+ ] + grit_defines + grit_flags
visibility = target_visibility
}
« no previous file with comments | « build/config/BUILDCONFIG.gn ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698