GitLab

This reverts commit 0dce4507.

Reason for revert: Fixed cronet issue

Original change's description:
> Revert "Android build: moved proguarding into dex() for most cases"
> 
> This reverts commit 93aa458f.
> 
> Reason for revert: Suspect for build failure https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/android-rel/2802
> 
> Original change's description:
> > Android build: moved proguarding into dex() for most cases
> > 
> > This is to allow R8 to proguard and dex in one call, since it has some
> > optimizations that only work when doing everything in one shot.
> > 
> > Bug: 872904
> > Change-Id: Id2c75dac4d9feecae461a0b1e279056253f1b71b
> > Reviewed-on: https://chromium-review.googlesource.com/c/1227142
> > Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> > Reviewed-by: agrieve <agrieve@chromium.org>
> > Commit-Queue: Sam Maier <smaier@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#597257}
> 
> TBR=yfriedman@chromium.org,agrieve@chromium.org,smaier@chromium.org
> 
> Change-Id: Idf8f855094fb1bf4c4e1b47326b76166a158c1e8
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 872904
> Reviewed-on: https://chromium-review.googlesource.com/c/1265559
> Reviewed-by: Kevin McNee <mcnee@chromium.org>
> Commit-Queue: Kevin McNee <mcnee@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#597274}

TBR=yfriedman@chromium.org,agrieve@chromium.org,mcnee@chromium.org,smaier@chromium.org

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

Bug: 872904
Change-Id: I1bebed520132e81b199c639690d36171ccb46ab6
Reviewed-on: https://chromium-review.googlesource.com/c/1271792
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#598766}