From 0393c64af13702f297b31aace210b5e8dda13d73 Mon Sep 17 00:00:00 2001 From: Yves Gerey Date: Thu, 8 Nov 2018 18:30:39 +0100 Subject: [PATCH] [Win/boringSSL] Add nasm as part of required dependencies. In order to fix the roll https://webrtc-review.googlesource.com/c/src/+/110080, this CL updates WebRTC DEPS to be on a par with Chromium's CL: "Add nasm support to Chromium, use it for boringssl." https://chromium.googlesource.com/chromium/src/+/7d284aff8ccf98d2d1550fdfe28c3058864b0873 Bug: chromium:766721 Change-Id: I048116f6ec49876a1b878097efff631db8cafe68 Reviewed-on: https://webrtc-review.googlesource.com/c/110340 Reviewed-by: Oleh Prypin Commit-Queue: Yves Gerey Cr-Commit-Position: refs/heads/master@{#25573} --- DEPS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/DEPS b/DEPS index 267ed78996..40691f1036 100644 --- a/DEPS +++ b/DEPS @@ -169,6 +169,13 @@ deps = { 'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + '04a2a289a4222f80ad20717c25144981210d2eac', 'condition': 'checkout_android', }, + + # Used by boringssl. + 'src/third_party/nasm': { + 'url': Var('chromium_git') + '/chromium/deps/nasm.git' + '@' + + '20920a85609b0608d4c9c80b525196d07183b289' + }, + 'src/third_party/openh264/src': Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '3b51f16a4a41df729f8d647f03e48c5f272911ff', 'src/third_party/r8': {