Enforce that apk_under_test is used

Enforce that apk_under_test is used

An apk may provide instrumentation for itself or another apk. When
providing instrumentation for another apk, the target for that apk
should be added to the android_apk() target as apk_under_test. This
ensures that the instrumentation apk is built correctly.

TBR=yfriedman@chromium.org
BUG=359249
Committed: https://crrev.com/d61e56e5b33c3c19db6fd6bf4e2536a982d42ec2
Cr-Commit-Position: refs/heads/master@{#326723}

[cjhopman, 2015-04-22 22:35:40]

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

[cjhopman, 2015-04-22 22:35:58]

cjhopman@chromium.org changed reviewers:
+ newt@chromium.org

[cjhopman, 2015-04-22 22:35:58]

newt: *

[commit-bot: I haz the power, 2015-04-22 22:39:41]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1072193011/1

[commit-bot: I haz the power, 2015-04-22 22:53:25]

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

[commit-bot: I haz the power, 2015-04-22 22:53:26]

Dry run: Try jobs failed on following builders:
  linux_chromium_compile_dbg_32_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  win8_chromium_rel on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win8_chromium_rel...)

[newt (away), 2015-04-23 03:19:19]

lgtm with nits

https://codereview.chromium.org/1072193011/diff/20001/build/android/gyp/write...
File build/android/gyp/write_build_config.py (right):

https://codereview.chromium.org/1072193011/diff/20001/build/android/gyp/write...
build/android/gyp/write_build_config.py:52: 'Unexpected number of
instrumentation nodes in Android manifest (%s):'
I'd keep this simple:

  "More than one <instrumentation> element in manifest: " + self.path

the *(map(lamdba bit looks like an obfuscated code challenge

https://codereview.chromium.org/1072193011/diff/20001/build/android/gyp/write...
build/android/gyp/write_build_config.py:60: 'No instrumentation nodes found in
Android manifest (%s)' % self.path)
s/nodes/elements

node is the parent type of element, attribute, comment, etc

https://codereview.chromium.org/1072193011/diff/20001/build/android/gyp/write...
build/android/gyp/write_build_config.py:263: excluded_deps_dex_files =
[c['dex_path'] for c in tested_apk_library_deps]
Why not just modify deps_dex_files at this point? I don't see the purpose of
excluded_deps_dex_files; it seems cleaner the way it was.

[cjhopman, 2015-04-24 01:26:21]

https://codereview.chromium.org/1072193011/diff/20001/build/android/gyp/write...
File build/android/gyp/write_build_config.py (right):

https://codereview.chromium.org/1072193011/diff/20001/build/android/gyp/write...
build/android/gyp/write_build_config.py:52: 'Unexpected number of
instrumentation nodes in Android manifest (%s):'
On 2015/04/23 03:19:18, newt wrote:
> I'd keep this simple:
> 
>   "More than one <instrumentation> element in manifest: " + self.path
> 
> the *(map(lamdba bit looks like an obfuscated code challenge

Done.

https://codereview.chromium.org/1072193011/diff/20001/build/android/gyp/write...
build/android/gyp/write_build_config.py:60: 'No instrumentation nodes found in
Android manifest (%s)' % self.path)
On 2015/04/23 03:19:18, newt wrote:
> s/nodes/elements
> 
> node is the parent type of element, attribute, comment, etc

Done.

https://codereview.chromium.org/1072193011/diff/20001/build/android/gyp/write...
build/android/gyp/write_build_config.py:263: excluded_deps_dex_files =
[c['dex_path'] for c in tested_apk_library_deps]
On 2015/04/23 03:19:18, newt wrote:
> Why not just modify deps_dex_files at this point? I don't see the purpose of
> excluded_deps_dex_files; it seems cleaner the way it was.

Done.

[cjhopman, 2015-04-24 01:26:25]

The CQ bit was checked by cjhopman@chromium.org

[cjhopman, 2015-04-24 01:26:25]

The patchset sent to the CQ was uploaded after l-g-t-m from newt@chromium.org
Link to the patchset: https://codereview.chromium.org/1072193011/#ps40001
(title: " ")

[cjhopman, 2015-04-24 01:26:51]

cjhopman@chromium.org changed reviewers:
+ yfriedman@chromium.org

[cjhopman, 2015-04-24 01:26:52]

yfriedman@ tbred for chrome/android

[commit-bot: I haz the power, 2015-04-24 01:27:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1072193011/40001

[commit-bot: I haz the power, 2015-04-24 02:35:25]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-04-24 02:36:18]

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

[Yaron, 2015-04-24 14:25:08]

lgtm