Make channel available in Java via ChromeVersionConstants.java.

chrome/version.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Runs the version processing script over the given template file to produce
 # an output file. This is used for generating various forms of files that
 # incorporate the product name and version.
 #
 # This template automatically includes VERSION, LASTCHANGE, and BRANDING,
 #
@@ skipping 22 matching lines @@
     script = "//build/util/version.py"
 
     lastchange_path = "//build/util/LASTCHANGE"
     version_path = "//chrome/VERSION"
     if (is_chrome_branded) {
       branding_path = "//chrome/app/theme/google_chrome/BRANDING"
     } else {
       branding_path = "//chrome/app/theme/chromium/BRANDING"
     }
 
+    extra_args = []

[cjhopman, 2014/10/23 21:42:05]

document this new parameter above.

[cjhopman, 2014/10/23 21:42:05]

Also, I think my preference would be to expose a less powerful thing. Maybe
eval_args or some such (to match how it's described in build/util/version.py
--help) and do:

if (defined(invoker.eval_args)) {
  foreach(eval, invoker.eval_args) {
    args += [ "-e", eval ]
  }
}

[newt (away), 2014/10/23 22:02:28]

I considered that, but it didn't really seem worth duplicating the entire
interface of version.py into version.gni. It's more code duplication with
minimal benefits in my view. WDYT?

[cjhopman, 2014/10/23 22:05:48]

sgtm

[newt (away), 2014/10/23 22:25:24]

Done.

+    if (defined(invoker.extra_args)) {
+      extra_args = invoker.extra_args
+    }
+
     inputs = [
       version_path,
       invoker.source,
       lastchange_path,
       branding_path,
     ]
 
     outputs = [ invoker.output ]
 
     args = [
       "-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
   }
 }