Make apks build from a single ant .xml template

Make apks build from a single ant .xml template

The ant build files for each of the apks that we create consisted of
only fairly straightforward boilerplate. With the recent changes to
java_apk.gypi and the gyp targets we can now build these correctly from
a single .xml with the differences in how the targets are built being
reflected in the gyp files (and then passed into ant).

TBR=joth
BUG=145991
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=160396

[cjhopman, 2012-09-21 01:31:08]

yfriedman: everything

cc: ilevy, shashishekhar

[shashi, 2012-09-21 01:53:55]

http://codereview.chromium.org/10959034/diff/1/build/android/ant/common.xml
File build/android/ant/common.xml (right):

http://codereview.chromium.org/10959034/diff/1/build/android/ant/common.xml#n...
build/android/ant/common.xml:21: project.setProperty("configuration.name",
Where is configuration.name used?

http://codereview.chromium.org/10959034/diff/1/build/android/ant/sdk-targets.xml
File build/android/ant/sdk-targets.xml (right):

http://codereview.chromium.org/10959034/diff/1/build/android/ant/sdk-targets....
build/android/ant/sdk-targets.xml:177: <isfalse value="${project.is.testapp}"/>
It may be cleaner to use a different property, like copy.gdbserver than just
relying on project.is.testapp, a test app can have native code and may need
gdbserver, similarly a non test apk may have no native code and may not need gdb
server.

[Yaron, 2012-09-21 01:57:01]

http://codereview.chromium.org/10959034/diff/1/build/android/ant/chromium-apk...
File build/android/ant/chromium-apk.xml (right):

http://codereview.chromium.org/10959034/diff/1/build/android/ant/chromium-apk...
build/android/ant/chromium-apk.xml:15: name="out.dir"
I think hanging lines should be indented 4 (same below)

http://codereview.chromium.org/10959034/diff/1/build/android/ant/sdk-targets.xml
File build/android/ant/sdk-targets.xml (right):

http://codereview.chromium.org/10959034/diff/1/build/android/ant/sdk-targets....
build/android/ant/sdk-targets.xml:177: <isfalse value="${project.is.testapp}"/>
Where is this ever set?

[cjhopman, 2012-09-28 01:14:25]

http://codereview.chromium.org/10959034/diff/1/build/android/ant/chromium-apk...
File build/android/ant/chromium-apk.xml (right):

http://codereview.chromium.org/10959034/diff/1/build/android/ant/chromium-apk...
build/android/ant/chromium-apk.xml:15: name="out.dir"
On 2012/09/21 01:57:01, Yaron wrote:
> I think hanging lines should be indented 4 (same below)

Done.

http://codereview.chromium.org/10959034/diff/1/build/android/ant/common.xml
File build/android/ant/common.xml (right):

http://codereview.chromium.org/10959034/diff/1/build/android/ant/common.xml#n...
build/android/ant/common.xml:21: project.setProperty("configuration.name",
On 2012/09/21 01:53:55, shashi wrote:
> Where is configuration.name used?

This was introduced a long time ago towards supporting debug and release. I have
a simpler way of handling this that I'll add soon (as we begin seriously
considering support of both configurations) and so I've removed this.

http://codereview.chromium.org/10959034/diff/1/build/android/ant/sdk-targets.xml
File build/android/ant/sdk-targets.xml (right):

http://codereview.chromium.org/10959034/diff/1/build/android/ant/sdk-targets....
build/android/ant/sdk-targets.xml:177: <isfalse value="${project.is.testapp}"/>
On 2012/09/21 01:57:01, Yaron wrote:
> Where is this ever set?
This is set by Android's build.xml based upon the project's manifest. It is only
set for instrumentation test apks.

http://codereview.chromium.org/10959034/diff/1/build/android/ant/sdk-targets....
build/android/ant/sdk-targets.xml:177: <isfalse value="${project.is.testapp}"/>
On 2012/09/21 01:53:55, shashi wrote:
> It may be cleaner to use a different property, like copy.gdbserver than just
> relying on project.is.testapp, a test app can have native code and may need
> gdbserver, similarly a non test apk may have no native code and may not need
gdb
> server.

A testapp should only be testing against the java api exposed by the app that it
instruments. A non-testapp might not have native code (though all of ours do).

Adding another variable that can be conditionally set will just make the ant/gyp
files that bit more complicated. Since there is essentially no cost to copying
gdbserver when it isn't actually needed, my preference would be to either copy
gdbserver for all non-testapps or for all apks.

[shashi, 2012-09-28 01:32:05]

lgtm

[Yaron, 2012-09-28 17:51:23]

lgtm

http://codereview.chromium.org/10959034/diff/17003/build/android/ant/sdk-targ...
File build/android/ant/sdk-targets.xml (right):

http://codereview.chromium.org/10959034/diff/17003/build/android/ant/sdk-targ...
build/android/ant/sdk-targets.xml:109: <if condition="${project.is.testapp}">
Please add a comment about where this is set because right now it looks like
magic.

[cjhopman, 2012-09-28 18:13:58]

joth: android_webview

http://codereview.chromium.org/10959034/diff/17003/build/android/ant/sdk-targ...
File build/android/ant/sdk-targets.xml (right):

http://codereview.chromium.org/10959034/diff/17003/build/android/ant/sdk-targ...
build/android/ant/sdk-targets.xml:109: <if condition="${project.is.testapp}">
On 2012/09/28 17:51:23, Yaron wrote:
> Please add a comment about where this is set because right now it looks like
> magic.

Done.

[commit-bot: I haz the power, 2012-10-05 01:00:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/10959034/20001

[commit-bot: I haz the power, 2012-10-05 01:15:18]

Sorry for I got bad news for ya.
Compile failed with a clobber build.
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-10-05 01:26:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/10959034/20001

[commit-bot: I haz the power, 2012-10-05 01:46:36]

Retried try job too often for step(s) crypto_unittests, unit_tests,
cacheinvalidation_unittests, jingle_unittests, ipc_tests, interactive_ui_tests,
browser_tests, net_unittests, content_unittests, gpu_unittests, base_unittests,
media_unittests, content_browsertests, sql_unittests, printing_unittests,
sync_unit_tests, sandbox_linux_unittests, check_deps

[commit-bot: I haz the power, 2012-10-05 16:51:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/10959034/20001

[commit-bot: I haz the power, 2012-10-05 16:51:33]

Change committed as 160396