Reland of Make instrumentation_test_apk depend on their apk_under_test.

Reland #2 of Tweak GN deps of instrumentation apks

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

This improves build concurrency a little bit.

BUG=none

Committed: https://crrev.com/e5e26a188da143b498eedf02e7fc8b974bac207d
Cr-Commit-Position: refs/heads/master@{#375252}

[agrieve, 2016-02-11 17:03:20]

Created Reland of Make instrumentation_test_apk depend on their apk_under_test.

[agrieve, 2016-02-11 17:06:27]

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/1687933004/ )

Reason for revert:
going to fix it

Original issue's description:
> Revert of Make instrumentation_test_apk depend on their apk_under_test.
(patchset #2 id:70001 of https://codereview.chromium.org/1687723002/ )
> 
> Reason for revert:
> Speculative revert to try to fix widespread Android build failures:
http://crbug.com/586120
> 
> Original issue's description:
> > Tweak GN deps of instrumentation apks
> > 
> > Reland of https://codereview.chromium.org/1683823002/
> > 
> > This improves build concurrency a little bit.
> > 
> > BUG=none
> 
> TBR=jbudorick@chromium.org,iclelland@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

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

to

==========
Reland #2 of Tweak GN deps of instrumentation apks

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

This improves build concurrency a little bit.

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

[agrieve, 2016-02-11 17:07:29]

agrieve@chromium.org changed reviewers:
- hartmanng@chromium.org, iclelland@chromium.org

[agrieve, 2016-02-11 17:07:52]

On 2016/02/11 17:03:20, agrieve wrote:
> Created Reland of Make instrumentation_test_apk depend on their
apk_under_test.

Did a local build "all" of Release to repro failure then ensure fix worked.

[agrieve, 2016-02-11 18:00:41]

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

[commit-bot: I haz the power, 2016-02-11 18:04:12]

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

[commit-bot: I haz the power, 2016-02-11 19:39:49]

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

[commit-bot: I haz the power, 2016-02-11 19:39:49]

Dry run: This issue passed the CQ dry run.

[jbudorick, 2016-02-12 15:33:23]

https://codereview.chromium.org/1690983002/diff/70001/build/android/gyp/write...
File build/android/gyp/write_build_config.py (left):

https://codereview.chromium.org/1690983002/diff/70001/build/android/gyp/write...
build/android/gyp/write_build_config.py:447: proguard_config['tested_apk_info']
= tested_apk_config['proguard_info']
What's the reasoning behind removing this? I can't tell (or, tbh, tell where
it's used...)

[agrieve, 2016-02-12 15:47:11]

https://codereview.chromium.org/1690983002/diff/70001/build/android/gyp/write...
File build/android/gyp/write_build_config.py (left):

https://codereview.chromium.org/1690983002/diff/70001/build/android/gyp/write...
build/android/gyp/write_build_config.py:447: proguard_config['tested_apk_info']
= tested_apk_config['proguard_info']
On 2016/02/12 15:33:23, jbudorick wrote:
> What's the reasoning behind removing this? I can't tell (or, tbh, tell where
> it's used...)

It aligns with the change to the proguard rule in GN.

The "why change it this way", is that I thought it was just a bit too subtle the
way it was. By enforcing that build configs store only values for themselves, it
forces the GN rules to have to reach into apk_under_test's build_config to get
this value. This makes it more obvious in the GN rules that the dependency
exists.

[jbudorick, 2016-02-12 16:33:28]

lgtm

https://codereview.chromium.org/1690983002/diff/70001/build/android/gyp/write...
File build/android/gyp/write_build_config.py (left):

https://codereview.chromium.org/1690983002/diff/70001/build/android/gyp/write...
build/android/gyp/write_build_config.py:447: proguard_config['tested_apk_info']
= tested_apk_config['proguard_info']
On 2016/02/12 15:47:11, agrieve wrote:
> On 2016/02/12 15:33:23, jbudorick wrote:
> > What's the reasoning behind removing this? I can't tell (or, tbh, tell where
> > it's used...)
> 
> It aligns with the change to the proguard rule in GN.
> 
> The "why change it this way", is that I thought it was just a bit too subtle
the
> way it was. By enforcing that build configs store only values for themselves,
it
> forces the GN rules to have to reach into apk_under_test's build_config to get
> this value. This makes it more obvious in the GN rules that the dependency
> exists.

Makes sense.

[agrieve, 2016-02-12 18:19:22]

The CQ bit was checked by agrieve@chromium.org

[commit-bot: I haz the power, 2016-02-12 18:19:44]

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

[commit-bot: I haz the power, 2016-02-12 20:55:46]

Description was changed from

==========
Reland #2 of Tweak GN deps of instrumentation apks

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

This improves build concurrency a little bit.

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

to

==========
Reland #2 of Tweak GN deps of instrumentation apks

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

This improves build concurrency a little bit.

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

[commit-bot: I haz the power, 2016-02-12 20:55:46]

Committed patchset #2 (id:70001)

[jbudorick, 2016-02-12 22:11:53]

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

The reason for reverting is:
https://code.google.com/p/chromium/issues/detail?id=586641.

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

Description was changed from

==========
Reland #2 of Tweak GN deps of instrumentation apks

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

This improves build concurrency a little bit.

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

to

==========
Reland #2 of Tweak GN deps of instrumentation apks

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

This improves build concurrency a little bit.

BUG=none

Committed: https://crrev.com/e5e26a188da143b498eedf02e7fc8b974bac207d
Cr-Commit-Position: refs/heads/master@{#375252}
==========

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

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