Commit fc77e20c authored by Aaron Gable's avatar Aaron Gable Committed by Commit Bot

Revert "Migrate some internal-only ios and android entries to public DEPS."

This reverts commit 00dd1b27.

This commit introduced non-public dependencies to chromium/src.git.
These dependencies are protected behind the checkout_google_internal
flag. However, the pipeline which processes src.git for codesearch
does not understand or respect gclient conditionals. This caused
the pipeline to attempt to crawl these internal repos, and to
fire alerts when it consistently failed to do so.

This change is a temporary revert of the introduction of these
internal dependencies. When the codesearch deps-to-submodules
pipeline has been updated to respect gclient conditionals, we
can reland the change.

Original commit message:
> Migrate some internal-only ios and android entries to public DEPS.
>
> This is an expanded version of the ios_internal change in
> https://crrev.com/c/880903, which should be more acceptable to the
> Chrome release scripts.
>
> BUG=803846,807318
>
> Change-Id: Ic9ea736a754a6ade1f29bf044cde9b4687000dbd
> Reviewed-on: https://chromium-review.googlesource.com/895247
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
> Commit-Queue: Michael Moss <mmoss@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#533861}

TBR=dpranke@chromium.org, mmoss@chromium.org

Bug: 803846, 807318, 808487
Change-Id: Ie3dd2be59a106bd979fa15de16090e261d1f877e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/899672Reviewed-by: default avatarAaron Gable <agable@chromium.org>
Reviewed-by: default avatarMichael Moss <mmoss@chromium.org>
Commit-Queue: Michael Moss <mmoss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534098}
parent a4c9eb91
...@@ -49,10 +49,6 @@ vars = { ...@@ -49,10 +49,6 @@ vars = {
# custom_vars. # custom_vars.
'checkout_src_internal': False, '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 # Fetch the additional packages and files needed to run all of the
# telemetry tests. This is false by default as some stuff is only # telemetry tests. This is false by default as some stuff is only
# privately accessible. # privately accessible.
...@@ -189,12 +185,6 @@ deps = { ...@@ -189,12 +185,6 @@ deps = {
'src/chrome/test/data/vr/webvr_info': 'src/chrome/test/data/vr/webvr_info':
Var('chromium_git') + '/external/github.com/toji/webvr.info.git' + '@' + 'c58ae99b9ff9e2aa4c524633519570bf33536248', Var('chromium_git') + '/external/github.com/toji/webvr.info.git' + '@' + 'c58ae99b9ff9e2aa4c524633519570bf33536248',
'src/clank': {
# TODO(mmoss): Leave "floating" until auto-roller is working.
'url': 'https://chrome-internal.googlesource.com/clank/internal/apps.git' + '@' + 'refs/heads/master',
'condition': 'checkout_android and checkout_google_internal',
},
'src/ios/third_party/earl_grey/src': { 'src/ios/third_party/earl_grey/src': {
'url': Var('chromium_git') + '/external/github.com/google/EarlGrey.git' + '@' + '2fd8a7d4b76f820fb95bce495c0ceb324dbe3edb', 'url': Var('chromium_git') + '/external/github.com/google/EarlGrey.git' + '@' + '2fd8a7d4b76f820fb95bce495c0ceb324dbe3edb',
'condition': 'checkout_ios', 'condition': 'checkout_ios',
...@@ -260,11 +250,6 @@ deps = { ...@@ -260,11 +250,6 @@ deps = {
'condition': 'checkout_ios', 'condition': 'checkout_ios',
}, },
'src/ios_internal': {
'url': 'https://chrome-internal.googlesource.com/chrome/ios_internal.git' + '@' + '671969ff8c01a14ef454a2ee9e0be1c020475990',
'condition': 'checkout_ios and checkout_google_internal',
},
'src/media/cdm/api': 'src/media/cdm/api':
Var('chromium_git') + '/chromium/cdm.git' + '@' + '3fc73b9647ada546a981b7f17bb436702f914323', Var('chromium_git') + '/chromium/cdm.git' + '@' + '3fc73b9647ada546a981b7f17bb436702f914323',
...@@ -273,12 +258,6 @@ deps = { ...@@ -273,12 +258,6 @@ deps = {
'condition': 'checkout_nacl', 'condition': 'checkout_nacl',
}, },
'src/signing_keys': {
# TODO(mmoss): Leave "floating" until auto-roller is working.
'url': 'https://chrome-internal.googlesource.com/clank/apptestkey.git' + '@' + 'refs/heads/master',
'condition': 'checkout_android and checkout_google_internal',
},
'src/third_party/SPIRV-Tools/src': 'src/third_party/SPIRV-Tools/src':
Var('chromium_git') + '/external/github.com/KhronosGroup/SPIRV-Tools.git' + '@' + '9166854ac93ef81b026e943ccd230fed6c8b8d3c', Var('chromium_git') + '/external/github.com/KhronosGroup/SPIRV-Tools.git' + '@' + '9166854ac93ef81b026e943ccd230fed6c8b8d3c',
...@@ -297,12 +276,6 @@ deps = { ...@@ -297,12 +276,6 @@ deps = {
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'src/third_party/android_tools_internal': {
# TODO(mmoss): Leave "floating" until auto-roller is working.
'url': 'https://chrome-internal.googlesource.com/clank/third_party/android_tools.git' + '@' + 'refs/heads/master',
'condition': 'checkout_android and checkout_google_internal',
},
'src/third_party/angle': 'src/third_party/angle':
Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'), Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'),
...@@ -1411,8 +1384,4 @@ recursedeps = [ ...@@ -1411,8 +1384,4 @@ recursedeps = [
("src/third_party/angle", "DEPS.chromium"), ("src/third_party/angle", "DEPS.chromium"),
# src-internal has its own DEPS file to pull additional internal repos # src-internal has its own DEPS file to pull additional internal repos
'src-internal', '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