Skip to content

Commit

Permalink
[115 merge] Add chrome/src-internal under src
Browse files Browse the repository at this point in the history
This combines changs from main:
* https://crrev.com/c/4564593
* https://crrev.com/c/4324321

Reason for merge request: without //src/internal present in release
branches, we would need to support both paths until no release branch
uses old //src-internal path. Supporting both in recipes and recipe
configs is complex and would require many changes across many repos.

Bug: 1451907
Change-Id: Ifb86b828acaebeef0113002402b4959b99d1f653
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4596161
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Cr-Commit-Position: refs/branch-heads/5790@{#550}
Cr-Branched-From: 1d71a33-refs/heads/main@{#1148114}
  • Loading branch information
sokcevicG authored and Chromium LUCI CQ committed Jun 9, 2023
1 parent 5c735ac commit 23f5c79
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion DEPS
Expand Up @@ -298,6 +298,10 @@ vars = {
'webrtc_git': 'https://webrtc.googlesource.com',
'betocore_git': 'https://beto-core.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8
# and whatever else without interference from each other.
'src_internal_revision': 'refs/heads/chromium/5790',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and whatever else without interference from each other.
'skia_revision': 'refs/heads/chrome/m115',
Expand Down Expand Up @@ -1980,7 +1984,11 @@ deps = {
Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'),

'src-internal': {
'url': Var('chrome_git') + '/chrome/src-internal.git@refs/heads/chromium/5790',
'url': Var('chrome_git') + '/chrome/src-internal.git' + '@' + Var('src_internal_revision'),
'condition': 'checkout_src_internal',
},
'src/internal': {
'url': Var('chrome_git') + '/chrome/src-internal.git' + '@' + Var('src_internal_revision'),
'condition': 'checkout_src_internal',
},

Expand Down

0 comments on commit 23f5c79

Please sign in to comment.