From 7ae5e52d0ab486f41d4b20a134e547ebe2da3769 Mon Sep 17 00:00:00 2001 From: kjellander Date: Mon, 8 Feb 2016 23:46:34 -0800 Subject: [PATCH] Revert of Analyze support in gyp_webrtc (patchset #1 id:1 of https://codereview.webrtc.org/1369683004/ ) Reason for revert: I've decided to not aim for implementing analyze and focus on getting Swarming done instead, so I'm cleaning this up. Original issue's description: > Analyze support in gyp_webrtc > > BUG=chromium:482463 > TESTED=Manually tested using the JSON files attached to https://code.google.com/p/chromium/issues/detail?id=482463#c2 and: > webrtc/build/gyp_webrtc --analyzer nothing-files.json nothing-files-RESULT.json > webrtc/build/gyp_webrtc --analyzer everything-files.json everything-files-RESULT.json > webrtc/build/gyp_webrtc --analyzer test_support_unittests-files.json test_support_unittests-files-RESULT.json > Then I verified the result-json contained the expected output. > > R=phoglund@webrtc.org > > Committed: https://crrev.com/8108764552e20d657c0a6f75a6200b93de486659 > Cr-Commit-Position: refs/heads/master@{#10097} TBR=phoglund@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=chromium:482463 Review URL: https://codereview.webrtc.org/1681023003 Cr-Commit-Position: refs/heads/master@{#11532} --- webrtc/build/gyp_webrtc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/webrtc/build/gyp_webrtc b/webrtc/build/gyp_webrtc index cfe9ace1fc..2376cfbb85 100755 --- a/webrtc/build/gyp_webrtc +++ b/webrtc/build/gyp_webrtc @@ -38,13 +38,6 @@ def GetSupplementalFiles(): 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('-Gconfig_path=' + args.pop(0)) - args.append('-Ganalyzer_output_path=' + args.pop(0)) - if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)): print 'Skipping gyp_webrtc due to GYP_CHROMIUM_NO_ACTION env var.' sys.exit(0) @@ -107,14 +100,13 @@ if __name__ == '__main__': # Set the gyp depth variable to the root of the checkout. args.append('--depth=' + os.path.relpath(checkout_root)) - if not use_analyzer: - print 'Updating projects from gyp files...' - sys.stdout.flush() + print 'Updating projects from gyp files...' + sys.stdout.flush() # Off we go... gyp_rc = gyp.main(args) - if vs2013_runtime_dll_dirs and not use_analyzer: + if vs2013_runtime_dll_dirs: x64_runtime, x86_runtime = vs2013_runtime_dll_dirs vs_toolchain.CopyVsRuntimeDlls( os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()),