GitLab

This reverts commit 4ede9b9f.

Reason for revert: Broke
https://ci.chromium.org/p/chromium/builders/ci/android-archive-rel/7663

Original change's description:
> Android: Clean up trichrome synchronized proguard build rules.
> 
>   * Remove static_library_proguard_disabled and instead separate
>     static_library_provider and static_library_synchronized_proguard
>     into separate flags.
>   * Only enable synchronized proguard for the most basic Trichrome
>     targets (can enable for others when we want to ship).
>   * Add a real dep on static library provider APKs (so that they don't
>     both need to be compiled explicitly).
>   * Clean up stale GN variables.
> 
> Bug: 921284, 901465
> Change-Id: I346fe3e824ece041cd1df064e81b2939e64c6882
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1955802
> Commit-Queue: Eric Stevenson <estevenson@chromium.org>
> Reviewed-by: Richard Coles <torne@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#726483}

TBR=torne@chromium.org,cjgrant@chromium.org,agrieve@chromium.org,estevenson@chromium.org

Change-Id: Ic3aaba93577e7f6b7bd92bc21bc72782cc4f981c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 921284, 901465
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977063Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726522}