GitLab

This reverts commit 9b5e9e3c.

Reason for revert: https://crbug.com/935964

Original change's description:
> Trichrome: Remove webview deps from trichrome_chrome_apk.
> 
> These were pulled in because trichrome uses monochrome
> templates. Since Trichrome still shares the same native library
> logic with monochrome it makes sense to continue using monochrome
> templates, but using a variable |is_trichrome| to differentiate
> trichrome from monochrome.
> 
> This CL removes Java deps, some Java resource deps, and webview's
> locale pak files from TrichromeChrome.apk.
> 
> Validated CL changes by:
>   * Building the 3 trichrome apks and their downstream variants
>   * Installing/launching TrichromeChrome.apk
>   * Manually inspecting the .build_config and "unzip -l" changes
> 
>       |     old (c)|     new (c)|    diff (c)|
>  total|    24.8 MiB|    23.6 MiB|    -1.2 MiB|
>    dex|     6.8 MiB|     6.4 MiB|  -392.1 KiB|
>   arsc|     4.9 MiB|     4.8 MiB|  -101.8 KiB|
>    xml|   344.9 KiB|   344.9 KiB|        -6 B|
>    res|   912.3 KiB|   908.2 KiB|    -4.1 KiB|
> native|   254.6 KiB|   254.6 KiB|        +0 B|
>  asset|    11.1 MiB|    10.4 MiB|  -698.0 KiB|
>   misc|   145.3 KiB|   142.4 KiB|    -2.9 KiB|
> 
> Bug: 932253
> Change-Id: Iedb427aa5ec05ad3bc905ac61b23f615349d579e
> Reviewed-on: https://chromium-review.googlesource.com/c/1481019
> Commit-Queue: Eric Stevenson <estevenson@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#634385}

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

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

Bug: 932253, 935964
Change-Id: Ib96734d9bba049b72735f0fffd0ac31d4aea914b
Reviewed-on: https://chromium-review.googlesource.com/c/1490493Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635819}