diff options
| author | Artem Titov <titovartem@webrtc.org> | 2018-05-11 11:23:00 +0200 |
|---|---|---|
| committer | Artem Titov <titovartem@webrtc.org> | 2018-05-11 09:30:12 +0000 |
| commit | a04d140666a0601f4b13c7d2d4c09ad575053add (patch) | |
| tree | 60cc696a842356601cb86358fb98944522cb5935 /DEPS | |
| parent | 5c7efe7fe8f8ac569124e12b5e59bc6c168fa216 (diff) | |
| download | webrtc-a04d140666a0601f4b13c7d2d4c09ad575053add.tar.gz | |
Remove third_party from DEPS file to prepare to check it into webrtc.
Remove third_party from DEPS and modify autoroller script to check
chromium third_party directly into webrtc repo.
Change-Id: Ib0b77fc414116babc193b2289a5e9c3256daf566
No-Presubmit: True
Bug: webrtc:8366
Reviewed-on: https://webrtc-review.googlesource.com/73801
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@google.com>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23204}
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -2,6 +2,9 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', + # Used by the WebRTC DEPS autoroller to update third_party/. If you need to run autoroller localy, + # you can set it via custom_vars section in the .gclient file. + 'roll_chromium_into_webrtc': False, # By default, we should check out everything needed to run on the main # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', @@ -37,6 +40,10 @@ vars = { # the commit queue can handle CLs rolling HarfBuzz # and whatever else without interference from each other. 'harfbuzz_revision': '957e7756634a4fdf1654041e20e883cf964ecac9', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling Chromium third_party + # and whatever else without interference from each other. + 'chromium_third_party_revision': '4e16929f465a47942875a80da0140bfaa59e99fb', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency @@ -59,8 +66,11 @@ deps = { }, 'src/testing': Var('chromium_git') + '/chromium/src/testing' + '@' + '519bd6bd8883f17137857e86cc73491d39415057', - 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '332e6754f377ca77a48eeeb139ee8d1c2f3ca739', + # This entry is used for chromium third_party rolling into webrtc third_party only. + 'src/third_party_chromium': { + 'url': Var('chromium_git') + '/chromium/src/third_party' + '@' + Var('chromium_third_party_revision'), + 'condition': 'roll_chromium_into_webrtc', + }, 'src/third_party/android_ndk': { 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '5cd86312e794bdf542a3685c6f10cbb96072990b', 'condition': 'checkout_android', |