GitLab

This reverts commit a00b988e.

Reason for revert: speculative revert as a possible cause of android build failures (https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8916352597455843616/+/steps/compile/0/stdout)

Original change's description:
> Android: Link against apk_under_test resources for test apks
> 
> Test apks are allowed to reference resources that live in the apk_under_test.
> We've previous supported such references via R.java constants, but this
> CL also adds the ability for resources in the test apk to directly
> reference resources in the apk_under_test (e.g. via xml @references).
> 
> The need for this has come with the latest version of the support
> library.
> 
> To accomplish this:
> 1. Adds a "-I UnderTest.ap_" flag when compiling test apks resources
> 2. Sets the test apk's arsc package name to match the apk_under_test's
>    package name.
> 3. Uses --emit-ids / --stable-ids to avoid collisions between the
>    test apk and the apk_under_test.
> 4. Updates incremental install manifest logic to do the same trick.
> 
> Some other small tweaks to related resource code:
> * Removes incremental AndroidManifest.xml as an explicit build output
> * Moves most uses of "aapt dump" to "aapt2 dump"
> * Removes --check-resources-pkg-id in favor of always enabling it
> * Removes --optimize-resources in favor of having it implicitly set by
>   --optimized-resources-path
> 
> Bug: 896775
> Change-Id: I6ea2d1ec8d1109bede4e0701eb4c7aeaa2a67503
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1556395
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Eric Stevenson <estevenson@chromium.org>
> Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#650427}

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

Change-Id: Ie70c31177c5b5e33d830a9d4fc57f10613fc5d30
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 896775
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1566365Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#650453}