Fix some references to Makefiles in gyp_skia.

gyp_skia

 #!/usr/bin/python
 
 # Copyright 2011 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script is a wrapper which invokes gyp with the correct --depth argument,
 # and supports the automatic regeneration of build files if all.gyp is
 # changed (Linux-only).
@@ skipping 17 matching lines @@
 sys.path.insert(0, os.path.join(gyp_source_dir, 'pylib'))
 import gyp
 
 ENVVAR_GYP_GENERATORS = 'GYP_GENERATORS'
 
 
 def additional_include_files(args=[]):
   # Determine the include files specified on the command line.
   # This doesn't cover all the different option formats you can use,
   # but it's mainly intended to avoid duplicating flags on the automatic
-  # makefile regeneration which only uses this format.
+  # build files regeneration which only uses this format.

[epoger, 2014/05/07 13:47:01]

I would leave this line alone, because it is referring to something particular:
automatic makefile regeneration.

AFAIK that is specific to regenerating Makefiles (capital-M, for make only)

[tfarina, 2014/05/07 14:41:10]

Done.

   specified_includes = set()
   for arg in args:
     if arg.startswith('-I') and len(arg) > 2:
       specified_includes.add(os.path.realpath(arg[2:]))
 
   result = []
   def AddInclude(path):
     if os.path.realpath(path) not in specified_includes:
       result.append(path)
 
   # Always include common.gypi.
   # We do this, rather than including common.gypi explicitly in all our gyp
   # files, so that gyp files we use but do not maintain (e.g.,
   # third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too.
   AddInclude(os.path.join(gyp_config_dir, 'common.gypi'))
 
   return result
 
-# Return the directory where all generated files (including Makefiles) are to
-# be written.
+# Return the directory where all the build files are to be written.
 def get_output_dir():
-
   # SKIA_OUT can be any directory either as a child of the standard out/
   # directory or any given location on the file system (e.g. /tmp/skia)
   output_dir = os.getenv('SKIA_OUT')
 
   if not output_dir:
     return os.path.join(os.path.abspath(script_dir), 'out')
 
   if (sys.platform.startswith('darwin') and
       (not os.getenv(ENVVAR_GYP_GENERATORS) or
        'xcode' in os.getenv(ENVVAR_GYP_GENERATORS))):
@@ skipping 41 matching lines @@
   # If we didn't get a file, then fall back to assuming 'skia.gyp' from the
   # same directory as the script.
   # The gypfile must be passed as a relative path, not an absolute path,
   # or else the gyp code doesn't write into the proper output dir.
   if not gyp_file_specified:
     args.append('skia.gyp')
 
   args.extend(['-I' + i for i in additional_include_files(args)])
   args.extend(['--depth', '.'])
 
-  # Tell gyp to write the Makefiles into output_dir
+  # Tell gyp to write the build files into output_dir.
   args.extend(['--generator-output', os.path.abspath(get_output_dir())])
 
-  # Tell make to write its output into the same dir
+  # Tell ninja to write its output into the same directory.
   args.extend(['-Goutput_dir=.'])
 
   # By default, we build 'most' instead of 'all' or 'everything'. See skia.gyp.
   args.extend(['-Gdefault_target=most'])
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   # Off we go...
   sys.exit(gyp.main(args))