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

Side by Side Diff: gyp_skia

Issue 25535002: Fix ninja build on Android (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | platform_tools/android/bin/android_make » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 2
3 # Copyright 2011 The Android Open Source Project 3 # Copyright 2011 The Android Open Source Project
4 # 4 #
5 # Use of this source code is governed by a BSD-style license that can be 5 # Use of this source code is governed by a BSD-style license that can be
6 # found in the LICENSE file. 6 # found in the LICENSE file.
7 7
8 # This script is a wrapper which invokes gyp with the correct --depth argument, 8 # This script is a wrapper which invokes gyp with the correct --depth argument,
9 # and supports the automatic regeneration of build files if all.gyp is 9 # and supports the automatic regeneration of build files if all.gyp is
10 # changed (Linux-only). 10 # changed (Linux-only).
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 # SKIA_OUT can be any directory either as a child of the standard out/ 58 # SKIA_OUT can be any directory either as a child of the standard out/
59 # directory or any given location on the file system (e.g. /tmp/skia) 59 # directory or any given location on the file system (e.g. /tmp/skia)
60 output_dir = os.getenv('SKIA_OUT') 60 output_dir = os.getenv('SKIA_OUT')
61 61
62 if not output_dir: 62 if not output_dir:
63 return os.path.join(os.path.abspath(script_dir), 'out') 63 return os.path.join(os.path.abspath(script_dir), 'out')
64 64
65 if (sys.platform.startswith('darwin') and 65 if (sys.platform.startswith('darwin') and
66 (not os.getenv('GYP_GENERATORS') or 66 (not os.getenv('GYP_GENERATORS') or
67 'make' not in os.getenv('GYP_GENERATORS'))): 67 'xcode' in os.getenv('GYP_GENERATORS'))):
68 print 'ERROR: variable SKIA_OUT is not valid on Mac (using xcodebuild)' 68 print 'ERROR: variable SKIA_OUT is not valid on Mac (using xcodebuild)'
69 sys.exit(-1); 69 sys.exit(-1);
70 70
71 if os.path.isabs(output_dir): 71 if os.path.isabs(output_dir):
72 return output_dir 72 return output_dir
73 else: 73 else:
74 return os.path.join(os.path.abspath(script_dir), output_dir) 74 return os.path.join(os.path.abspath(script_dir), output_dir)
75 75
76 76
77 if __name__ == '__main__': 77 if __name__ == '__main__':
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 args.extend(['-Goutput_dir=.']) 109 args.extend(['-Goutput_dir=.'])
110 110
111 # By default, we build 'most' instead of 'all' or 'everything'. See skia.gyp. 111 # By default, we build 'most' instead of 'all' or 'everything'. See skia.gyp.
112 args.extend(['-Gdefault_target=most']) 112 args.extend(['-Gdefault_target=most'])
113 113
114 print 'Updating projects from gyp files...' 114 print 'Updating projects from gyp files...'
115 sys.stdout.flush() 115 sys.stdout.flush()
116 116
117 # Off we go... 117 # Off we go...
118 sys.exit(gyp.main(args)) 118 sys.exit(gyp.main(args))
OLDNEW
« no previous file with comments | « no previous file | platform_tools/android/bin/android_make » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698