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

Unified Diff: build/gyp_chromium

Issue 337903004: Adds support for running analyzer from gyp_chromium (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweaks Created 6 years, 6 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 48c738928528537f524401309ea4d22d174910ed..6aede4792a23fa8df261e0266b3540498f544bbb 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -189,6 +189,12 @@ def additional_include_files(supplemental_files, args=[]):
if __name__ == '__main__':
args = sys.argv[1:]
+ use_analyzer = len(args) and args[0] == '--analyzer'
+ if use_analyzer:
+ args.pop(0)
+ os.environ['GYP_GENERATORS'] = 'analyzer'
+ args.append('-Gfile_path=' + args.pop(0))
+
if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)):
# Check for landmines (reasons to clobber the build) in any case.
print 'Running build/landmines.py...'
@@ -307,22 +313,24 @@ if __name__ == '__main__':
args.extend(['-D', 'gyp_output_dir=' + GetOutputDirectory()])
- print 'Updating projects from gyp files...'
- sys.stdout.flush()
+ if not use_analyzer:
+ print 'Updating projects from gyp files...'
+ sys.stdout.flush()
# Off we go...
gyp_rc = gyp.main(args)
- # Check for landmines (reasons to clobber the build). This must be run here,
- # rather than a separate runhooks step so that any environment modifications
- # from above are picked up.
- print 'Running build/landmines.py...'
- subprocess.check_call(
+ if not use_analyzer:
kjellander_chromium 2015/09/28 17:43:05 May I ask why it's skipping copying of the runtime
+ # Check for landmines (reasons to clobber the build). This must be run here,
+ # rather than a separate runhooks step so that any environment modifications
+ # from above are picked up.
+ print 'Running build/landmines.py...'
+ subprocess.check_call(
[sys.executable, os.path.join(script_dir, 'landmines.py')])
- if vs2013_runtime_dll_dirs:
- x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
- vs_toolchain.CopyVsRuntimeDlls(
+ if vs2013_runtime_dll_dirs:
+ x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
+ vs_toolchain.CopyVsRuntimeDlls(
os.path.join(chrome_src, GetOutputDirectory()),
(x86_runtime, x64_runtime))
« 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