admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Drop tools/gyp from dependencies."

Browse Source 
This reverts commit 724a97d08d35b69d934b1c09fc2e0f4dd4d47f76.

Reason for revert: We have this error during gclient runhooks on some
windows bots:
Downloading https://commondatastorage.googleapis.com/chromium-browser-clang/Win/clang-334100-1.tgz .......... Done.
Traceback (most recent call last):
  File "src/tools/clang/scripts/update.py", line 927, in <module>
    sys.exit(main())
  File "src/tools/clang/scripts/update.py", line 923, in main
    return UpdateClang(args)
  File "src/tools/clang/scripts/update.py", line 470, in UpdateClang
    CopyDiaDllTo(os.path.join(LLVM_BUILD_DIR, 'bin'))
  File "src/tools/clang/scripts/update.py", line 396, in CopyDiaDllTo
    dia_path = os.path.join(GetVSVersion().Path(), 'DIA SDK', 'bin', 'amd64')
  File "src/tools/clang/scripts/update.py", line 388, in GetVSVersion
    import gyp.MSVSVersion
ImportError: No module named gyp.MSVSVersion

Looks like if toolchain is not downloaded before then it failed to
download it from scratch.

Original change's description:
> Drop tools/gyp from dependencies.
> 
> Bug: webrtc:6323
> Change-Id: I894f0ea95fb6707242a061947b4f4602b48910e6
> Reviewed-on: https://webrtc-review.googlesource.com/6763
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#23613}

TBR=phoglund@webrtc.org,nisse@webrtc.org

Change-Id: I38ff915cccfdcc80af9e2f82130bccd33bf7ea86
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:6323
Reviewed-on: https://webrtc-review.googlesource.com/83744
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23617}
This commit is contained in:
Artem Titov 2018-06-14 23:41:17 +00:00 committed by Commit Bot
parent 0a5fdbb455
commit 0f173bde9e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -186,6 +186,8 @@ deps = {
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
'src/tools':
Var('chromium_git') + '/chromium/src/tools' + '@' + 'e61dbb7de4535e8928f7c65cffdfae5ebe1ef470',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),