Make test apks exclude dex files in tested apk

Make test apks exclude dex files in tested apk

This adds the apk_under_test variable to the android_apk template. When this is
set, we will build the apk as though it is an instrumentation test for the apk
set in apk_under_test. When building an instrumentation test apk, the dex file
should not contain libraries that are already included in the apk_under_test
(the dex files from both apks are loaded into the classloader when running
 tests).

The dex files to be included are calculating in write_build_config.py.

BUG=359249
Committed: https://crrev.com/7b9ba2e6b4f149845360a6e0f3fa4b0ac459e6be
Cr-Commit-Position: refs/heads/master@{#326398}

[cjhopman, 2015-04-17 19:12:37]

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

[cjhopman, 2015-04-17 19:12:37]

newt: *

[newt (away), 2015-04-17 21:19:19]

lgtm

[cjhopman, 2015-04-17 22:56:03]

The CQ bit was checked by cjhopman@chromium.org

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

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

[commit-bot: I haz the power, 2015-04-18 00:25:47]

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

[commit-bot: I haz the power, 2015-04-18 00:25:48]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[cjhopman, 2015-04-21 17:55:49]

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

[cjhopman, 2015-04-21 17:55:49]

yfriedman: content/shell/android/

[Yaron, 2015-04-21 20:27:12]

On 2015/04/21 17:55:49, cjhopman wrote:
> yfriedman: content/shell/android/

that lgtm but what about chrome_shell and other apps?

[cjhopman, 2015-04-22 19:16:34]

On 2015/04/21 20:27:12, Yaron wrote:
> On 2015/04/21 17:55:49, cjhopman wrote:
> > yfriedman: content/shell/android/
> 
> that lgtm but what about chrome_shell and other apps?

Yeah, they should all be switched, too, but that doesn't need to be done
immediately.

I'm thinking that we'll add something that actually verifies that what you
specify in the build file matches what your AndroidManifest.xml says. Then we
can enforce it and help you do it correctly. At that point all the
instrumentation test apks will have to be updated.

[cjhopman, 2015-04-22 19:16:44]

The CQ bit was checked by cjhopman@chromium.org

[cjhopman, 2015-04-22 19:16:45]

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

[commit-bot: I haz the power, 2015-04-22 19:18:04]

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

[commit-bot: I haz the power, 2015-04-22 23:32:00]

Committed patchset #2 (id:20001)

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

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