From 4759bfb2a4fa55f440d947f8f71ea033d85a2215 Mon Sep 17 00:00:00 2001 From: kjellander Date: Sun, 13 Dec 2015 22:40:46 -0800 Subject: [PATCH] Roll chromium_revision 7de03ed..4bc4277 (364770:364953) Change log: https://chromium.googlesource.com/chromium/src/+log/7de03ed..4bc4277 Full diff: https://chromium.googlesource.com/chromium/src/+/7de03ed..4bc4277 Changed dependencies: * src/third_party/usrsctp/usrsctplib: Moved from https://chromium.googlesource.com/external/usrsctplib.git/+/36444a9 to https://chromium.googlesource.com/external/github.com/sctplab/usrsctp/+/c60ec8b DEPS diff: https://chromium.googlesource.com/chromium/src/+/7de03ed..4bc4277/DEPS No update to Clang. TBR= Review URL: https://codereview.webrtc.org/1521303003 Cr-Commit-Position: refs/heads/master@{#11001} --- DEPS | 2 +- talk/libjingle.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 34a8854811..cb29b08e43 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '7de03ed2684c7027cd8229dfc47b8547b29f7309', + 'chromium_revision': '4bc4277165a4314aa9612f43202cbacd782cfc35', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index f1ce18d96a..c004aad875 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -539,7 +539,7 @@ 'include_dirs': [ # TODO(jiayl): move this into the direct_dependent_settings of # usrsctp.gyp. - '<(DEPTH)/third_party/usrsctp', + '<(DEPTH)/third_party/usrsctp/usrsctplib', ], 'dependencies': [ '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',