Commit fe117599 authored by Michael Moss's avatar Michael Moss

Revert "Add variable to conditionally fetch ios_internal."

This reverts commit 6d438d70.

Reason for revert: Causing errors in release scripts which is blocking canary release.

BUG: 807318

Original change's description:
> Add variable to conditionally fetch ios_internal.
> 
> Add variable checkout_ios_internal to conditionally fetch ios_internal.
> Use pinned revision to ensure build stays hermetic and reproducible.
> 
> Bug: 803846
> Change-Id: Id8ba650400b283645f8c00629dd269739d813195
> Reviewed-on: https://chromium-review.googlesource.com/880903
> Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Reviewed-by: Michael Moss <mmoss@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Reviewed-by: Rohit Rao <rohitrao@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#532437}

TBR=rohitrao@chromium.org,mmoss@chromium.org,dpranke@chromium.org,sdefresne@chromium.org,jbudorick@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 803846
Change-Id: I15afba5e030ccd58b80a78c60ad452657c89169a
Reviewed-on: https://chromium-review.googlesource.com/894242Reviewed-by: default avatarMichael Moss <mmoss@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533110}
parent b454d587
......@@ -49,10 +49,6 @@ vars = {
# custom_vars.
'checkout_src_internal': False,
# By default, do not check out Google's internal dependencies. This can be
# overridden e.g. with custom_vars.
'checkout_google_internal': False,
# Fetch the additional packages and files needed to run all of the
# telemetry tests. This is false by default as some stuff is only
# privately accessible.
......@@ -251,11 +247,6 @@ deps = {
'condition': 'checkout_ios',
},
'src/ios_internal': {
'url': 'https://chrome-internal.googlesource.com/chrome/ios_internal.git' + '@' + '3fd2cebe6fc1ccd43675a23d492c323aa42e3b81',
'condition': 'checkout_ios and checkout_google_internal',
},
'src/media/cdm/api':
Var('chromium_git') + '/chromium/cdm.git' + '@' + 'ca7130aa8fe6dd6c0664b52768d1957af31ae91b',
......@@ -1377,8 +1368,4 @@ recursedeps = [
("src/third_party/angle", "DEPS.chromium"),
# src-internal has its own DEPS file to pull additional internal repos
'src-internal',
# src/ios_internal has its own DEPS file (named DEPS.chromium until the
# transition to gclient conditions is complete, see http://crbug.com/803846
# for progress).
('src/ios_internal', 'DEPS.chromium'),
]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment