GitLab

This reverts commit 6a52c6f8.

Reason for revert:

Findit has probably misidentified this CL as the culprit in those changes. If the error had
something to do with locales or binary size that would make sense, but this CL does not
touch the files involved.

It looks like this CL (https://crrev.com/c/1945994) has reverted a change that actually
affects the relevant file:

   /build/scripts/slave/recipe_modules/chromium/resources/ninja_wrapper.py

Original change's description:
> Revert "refactor android locales in locales.gni"

> This reverts commit 15204aaf.

> Reason for revert:

> Findit (https://goo.gl/kROfz5) identified CL at revision 720636 as the
> culprit for failures in the build cycles as shown on:
> https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzE1MjA0YWFmMDdlYWZmNTkzZDdhM2Q2ZDdlYjdhNjljOGI5MGE1NWEM
>
> Sample Failed Build: https://ci.chromium.org/b/8895149418482727520
>
> Sample Failed Step: compile
>
> Original change's description:
> > refactor android locales in locales.gni
> >
> > This CL refactors build/config/locales.gni but makes no actual
> > changes to what locales are used.
> >
> > The primary change is to remove android_chrome_omitted_locales
> > and replace it with android_non_bundle_locales.
> > This list should be used directly instead of subtracting omitted
> > locales from locales.
> >
> > Additionally the list all_chrome_locales was added as the superset
> > of all supported locales.  Platform specific lists are made by
> > subtracting from this list.
> >
> > No changes were made to the iOS and Mac locale lists names.
> >
> > Bug: 812837
> > Change-Id: I26e9c1b2d40397a6ed02777db55c44be93060050
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1939962
> > Commit-Queue: Trevor  Perrier <perrier@chromium.org>
> > Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> > Reviewed-by: Ted Choc <tedchoc@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#720636}
>
>
> Change-Id: I91d7824e9e0b292c3376556947cbe4aced6bd0be
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 812837
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1947226
> Cr-Commit-Position: refs/heads/master@{#720650}

Change-Id: I29644d0edd27a9d8bc5f6c29d8bc86fe9b47322d
Bug: 812837
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1945998
Commit-Queue: Trevor  Perrier <perrier@chromium.org>
Reviewed-by: Megan Jablonski <megjablon@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720718}