Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Unified Diff: gyp_skia

Issue 263083006: Fix some references to Makefiles in gyp_skia. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: makefile Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp_skia
diff --git a/gyp_skia b/gyp_skia
index 20bfd7901b022234db71fd599b9de8154c1448e5..151fa7b0d0f9430aec001395d136fd7d446ca89d 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698