Index: gyp_skia |
diff --git a/gyp_skia b/gyp_skia |
index 20bfd7901b022234db71fd599b9de8154c1448e5..01b202a9b6c50051ed7a7160805766883765b2dd 100755 |
--- a/gyp_skia |
+++ b/gyp_skia |
@@ -35,7 +35,7 @@ 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 refer
tfarina
2014/05/07 14:41:10
Done.
|
specified_includes = set() |
for arg in args: |
if arg.startswith('-I') and len(arg) > 2: |
@@ -54,10 +54,8 @@ def additional_include_files(args=[]): |
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') |
@@ -119,10 +117,10 @@ if __name__ == '__main__': |
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. |