Add option to allow mojob to specify extra gn args.

mojo/tools/mopy/gn.py

 # Copyright 2015 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.
 
 """
 GN-related configuration functions, e.g., to produce a Config object from a GN
 args.gn file).
 """
 
 
@@ skipping 56 matching lines @@
     gn_args["use_glib"] = False
     gn_args["use_system_harfbuzz"] = False
   elif config.target_os == Config.OS_LINUX:
     gn_args["is_desktop_linux"] = False
     gn_args["use_aura"] = False
     gn_args["use_glib"] = False
     gn_args["use_system_harfbuzz"] = False
 
   gn_args["target_cpu"] = config.target_cpu
 
+  val = config.values.get("self_built_network_service_location")

[qsr, 2015/03/09 11:58:41]

I don't think you want this here. Any reason you would need it?

[haltonhuo, 2015/03/09 12:13:00]

Yes, it is needed, otherwise the "gn gen --args" command will missed that
argument, thus the self_built_network_service_location won't bet set in
out_dir/args.gn.

[qsr, 2015/03/09 13:13:06]

You do not want to have anything about this variable in those files, and what
you add should work for all args passed to mojob.

 

[haltonhuo, 2015/03/10 06:50:44]

Done in patch set 6

+  if (val):
+    gn_args["self_built_network_service_location"] = val
+
   return gn_args
 
 
 def CommandLineForGNArgs(gn_args):
   """
   Returns the list of gn arguments to use with the gn command line.
   """
   def _ToCommandLine(key, value):
     if type(value) is bool:
       return "%s=%s" % (key, "true" if value else "false")
@@ skipping 34 matching lines @@
   values = {}
   with open(gn_file, "r") as f:
     for line in f.readlines():
       line = re.sub("\s*#.*", "", line)
       result = re.match("^\s*(\w+)\s*=\s*(.*)\s*$", line)
       if result:
         key = result.group(1)
         value = result.group(2)
         values[key] = ast.literal_eval(TRANSLATIONS.get(value, value))
   return values