Make channel available in Java via ChromeVersionConstants.java.

chrome/version.gni

Index: chrome/version.gni
diff --git a/chrome/version.gni b/chrome/version.gni
index 771ea28541d39b6ea0373a6485e6132622b4dfbd..a4b3193a54c743f3f265a2ae57ec243988ea2df9 100644
--- a/chrome/version.gni
+++ b/chrome/version.gni
@@ -15,12 +15,16 @@
 #   output:
 #     File name of file to write.
 #
+#   extra_args:
+#     Extra arguments to pass to version.py.
+#
 #   visibility (optional)
 #
 # Example:
 #   process_version("myversion") {
 #     source = "myfile.h.in"
 #     output = "$target_gen_dir/myfile.h"
+#     extra_args = ["-e", "FOO=42"]
 #   }
 template("process_version") {
   assert(defined(invoker.source), "Source must be defined for $target_name")
@@ -40,6 +44,11 @@ template("process_version") {
       branding_path = "//chrome/app/theme/chromium/BRANDING"
     }
 
+    extra_args = []
+    if (defined(invoker.extra_args)) {
+      extra_args = invoker.extra_args
+    }
+
     inputs = [
       version_path,
       invoker.source,
@@ -53,8 +62,8 @@ template("process_version") {
       "-f", rebase_path(version_path, root_build_dir),
       "-f", rebase_path(branding_path, root_build_dir),
       "-f", rebase_path(lastchange_path, root_build_dir),
-      rebase_path(invoker.source, root_build_dir),
-      rebase_path(invoker.output, root_build_dir),
-    ]
+      "-i", rebase_path(invoker.source, root_build_dir),
+      "-o", rebase_path(invoker.output, root_build_dir),
+    ] + extra_args

[brettw, 2014/10/29 20:46:36]

I'd just move the if down below here and avoid the local temporary. So

if (defined(invoker.extra_args)) {
  args += extra_args
}

[newt (away), 2014/10/29 21:04:19]

Good point. Done.

   }
 }