Reland of Make instrumentation_test_apk depend on their apk_under_test.

Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1683823002/

This improves build concurrency a little bit.

BUG=none

Committed: https://crrev.com/805aaf431e3694e870df4689735aa0040f58de1f
Cr-Commit-Position: refs/heads/master@{#374816}

[agrieve, 2016-02-10 01:45:12]

Created Reland of Make instrumentation_test_apk depend on their apk_under_test.

[agrieve, 2016-02-10 01:47:48]

Description was changed from

==========
Reland of Make instrumentation_test_apk depend on their apk_under_test.
(patchset #1 id:1 of https://codereview.chromium.org/1683823002/ )

Reason for revert:
going to reland with fix

Original issue's description:
> Revert of Make instrumentation_test_apk depend on their apk_under_test.
(patchset #2 id:20001 of https://codereview.chromium.org/1677903002/ )
> 
> Reason for revert:
> Build is broken:
> compile
> 
> Revision range:
> chromium 374412 : 374420
> 
> Failing builders:
> Android GN (dbg):
https://build.chromium.org/p/chromium.linux/builders/Android%20GN%20(dbg)
> 
> Appears to be caused by crrev.com/6c2fbb438add5f31cd9d37e580c4735a4c7becab
> 
> This didn't cause failures immediately; I suspect that it took a DEPS update
to cause a full build before the offending APK was a problem
> 
> Original issue's description:
> > Make instrumentation_test_apk depend on their apk_under_test.
> >
> > The test runner tries to install the apk_under_test, so it makes sense
> > that building the test should also build the apk_under_test.
> >
> > BUG=none
> >
> > Committed: https://crrev.com/6c2fbb438add5f31cd9d37e580c4735a4c7becab
> > Cr-Commit-Position: refs/heads/master@{#374402}
> 
> TBR=jbudorick@chromium.org,agrieve@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=none
> 
> Committed: https://crrev.com/fc37513b69d48a1b076febe2952d74fe9596cecd
> Cr-Commit-Position: refs/heads/master@{#374448}

TBR=jbudorick@chromium.org,iclelland@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
==========

to

==========
Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1683823002/

This improves build concurrency a little bit.

BUG=none
==========

[agrieve, 2016-02-10 01:49:55]

On 2016/02/10 01:45:12, agrieve wrote:
> Created Reland of Make instrumentation_test_apk depend on their
apk_under_test.

repro'ed the previous patch's failure locally & ensured that this fixes it
(note: it only failed when building "all")

[agrieve, 2016-02-10 17:02:58]

The CQ bit was checked by agrieve@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-02-10 17:06:41]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1687723002/70001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1687723002/70001

[commit-bot: I haz the power, 2016-02-10 17:51:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-02-10 17:51:40]

Dry run: This issue passed the CQ dry run.

[jbudorick, 2016-02-10 21:34:10]

lgtm

[agrieve, 2016-02-11 00:54:12]

The CQ bit was checked by agrieve@chromium.org

[commit-bot: I haz the power, 2016-02-11 00:56:43]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1687723002/70001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1687723002/70001

[commit-bot: I haz the power, 2016-02-11 01:07:04]

Description was changed from

==========
Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1683823002/

This improves build concurrency a little bit.

BUG=none
==========

to

==========
Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1683823002/

This improves build concurrency a little bit.

BUG=none
==========

[commit-bot: I haz the power, 2016-02-11 01:07:05]

Committed patchset #2 (id:70001)

[hartmanng, 2016-02-11 15:15:51]

A revert of this CL (patchset #2 id:70001) has been created in
https://codereview.chromium.org/1687933004/ by hartmanng@chromium.org.

The reason for reverting is: Speculative revert to try to fix widespread Android
build failures: http://crbug.com/586120.

[commit-bot: I haz the power, 2016-02-16 22:33:33]

Description was changed from

==========
Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1683823002/

This improves build concurrency a little bit.

BUG=none
==========

to

==========
Tweak GN deps of instrumentation apks

Reland of https://codereview.chromium.org/1683823002/

This improves build concurrency a little bit.

BUG=none

Committed: https://crrev.com/805aaf431e3694e870df4689735aa0040f58de1f
Cr-Commit-Position: refs/heads/master@{#374816}
==========

[commit-bot: I haz the power, 2016-02-16 22:33:33]

Patchset 2 (id:??) landed as
https://crrev.com/805aaf431e3694e870df4689735aa0040f58de1f
Cr-Commit-Position: refs/heads/master@{#374816}