Revert "Reland "Reland "Remove workaround made unnecessary by https://chromium-review.googlesource.com/c/1312234"""
This reverts commit 5eaa7f0167358c9073637e636b80b20639e698bb.
Reason for revert: Suspect this is breaking the release bots ('gclient setdep' error).
Original change's description:
> Reland "Reland "Remove workaround made unnecessary by https://chromium-review.googlesource.com/c/1312234""
>
> This reverts commit 319965600784a41581478e6cef29f0a7d8db210e.
>
> Reason for revert: This might work now, https://crbug.com/906114
>
> Original change's description:
> > Revert "Reland "Remove workaround made unnecessary by https://chromium-review.googlesource.com/c/1312234""
> >
> > This reverts commit 1ffe990d20bbcec3ffd31e41129bfc48fb9ad297.
> >
> > Reason for revert:
> > roll-dep is still broken with this (https://bugs.chromium.org/p/chromium/issues/detail?id=906114#c19)
> >
> > Original change's description:
> > > Reland "Remove workaround made unnecessary by https://chromium-review.googlesource.com/c/1312234"
> > >
> > > This is a reland of c56126056693dff05fe37f370fc1562cf0c17120
> > >
> > > Original change's description:
> > > > Remove workaround made unnecessary by https://chromium-review.googlesource.com/c/1312234
> > > >
> > > > Bug: 875037
> > > > Change-Id: Ia4a6393237602b88bb0130d9f916972e930d95b3
> > > > Reviewed-on: https://chromium-review.googlesource.com/c/1339339
> > > > Reviewed-by: Hans Wennborg <[email protected]>
> > > > Commit-Queue: Nico Weber <[email protected]>
> > > > Cr-Commit-Position: refs/heads/master@{#608783}
> > >
> > > TBR=hans
> > >
> > > Bug: 875037
> > > Change-Id: Iac24d9ec462cd4d5720d78a52b7f867be3ab2ec7
> > > Reviewed-on: https://chromium-review.googlesource.com/c/1344198
> > > Commit-Queue: Hans Wennborg <[email protected]>
> > > Reviewed-by: Nico Weber <[email protected]>
> > > Cr-Commit-Position: refs/heads/master@{#609974}
> >
> > [email protected],[email protected],[email protected],[email protected]
> >
> > Change-Id: I1b2327216797da231e11427a29edece425cd35bd
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: 875037
> > Reviewed-on: https://chromium-review.googlesource.com/c/1347333
> > Reviewed-by: Nico Weber <[email protected]>
> > Commit-Queue: Nico Weber <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#610177}
>
> [email protected],[email protected],[email protected],[email protected]
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 875037
> Change-Id: I223dd1baf8efe4ba8ca3ba4ff2c87e30319501eb
> Reviewed-on: https://chromium-review.googlesource.com/c/1417030
> Reviewed-by: Nico Weber <[email protected]>
> Commit-Queue: Nico Weber <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#623559}
[email protected],[email protected],[email protected],[email protected]
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 875037, 923240
Change-Id: Iadcca77053471e1b46637e55ee6a713b281835c5
Reviewed-on: https://chromium-review.googlesource.com/c/1420268
Reviewed-by: Michael Moss <[email protected]>
Commit-Queue: Michael Moss <[email protected]>
Auto-Submit: Michael Moss <[email protected]>
Cr-Commit-Position: refs/heads/master@{#624032}diff --git a/DEPS b/DEPS
index fcdc928..a22a537bc 100644
--- a/DEPS
+++ b/DEPS
@@ -48,6 +48,11 @@
# purposes.
'checkout_configuration': 'default',
+ # By default, don't check out android. Will be overridden by gclient
+ # variables.
+ # TODO(ehmaldonado): Remove this once the bug in gclient is fixed.
+ 'checkout_android': False,
+
# Pull in Android native toolchain dependencies for Chrome OS too, so we can
# build ARC++ support libraries.
'checkout_android_native_support': 'checkout_android or checkout_chromeos',
