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

Unified Diff: build/gyp_chromium

Issue 139143002: Move RunGN lower so that modifications to os.environ take effect (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index d2d94625c931b050e8ca63d79b0eeefbd84f6b8c..e316adfd65107eb5fdf238b660a0e204926f98c2 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -303,14 +303,6 @@ if __name__ == '__main__':
else:
args.append(os.path.join(script_dir, 'all.gyp'))
- supplemental_includes = GetSupplementalFiles()
-
- if not RunGN(supplemental_includes):
- sys.exit(1)
-
- args.extend(
- ['-I' + i for i in additional_include_files(supplemental_includes, args)])
-
# There shouldn't be a circular dependency relationship between .gyp files,
# but in Chromium's .gyp files, on non-Mac platforms, circular relationships
# currently exist. The check for circular dependencies is currently
@@ -377,6 +369,12 @@ if __name__ == '__main__':
if syntax_check and int(syntax_check):
args.append('--check')
+ supplemental_includes = GetSupplementalFiles()
+ if not RunGN(supplemental_includes):
+ sys.exit(1)
+ args.extend(
+ ['-I' + i for i in additional_include_files(supplemental_includes, args)])
+
print 'Updating projects from gyp files...'
sys.stdout.flush()
« 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