Simplify ant targets

Simplify ant targets

This change makes the behavior of apk-build.xml much clearer.
First, delete several empty targets:
  -pre-build
  -post-build
  -set-mode-check
  -post-package
  -set-debug-files

Then, merge chains of targets (i.e. only -compile depends on
-pre-compile and so they can be merged into one target).
check-env --> -setup
-pre-compile and -post-compile --> -compile
-crunch --> -package-resources
-release-sign --> release
-do-debug --> debug
-release-obfuscation-check --> -set-release-mode
-debug-obfuscation-check --> -set-debug-mode
-build-setup --> -setup

Then, rearrange the targets so that they are in the order that they are
run.

Finally, delete some small unused things (mergemanifest, buildconfig).

BUG=158821
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=188548

[Yaron, 2013-03-13 18:58:29]

I'm not entirely clear on the use of <sequential> task. Should we be guarding
some of our merged targets in <sequential> blocks or since we don't use
<parallel> there's no need? I don't understand why the sdk had some use of
sequential, I guess for nicely including in the clients' build?

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
File build/android/ant/apk-build.xml (left):

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
build/android/ant/apk-build.xml:289: <res path="${resource.absolute.dir}" />
This dir is no longer being created in -setup. Seems fine though as we're
actually passing in from gyp, right?

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
File build/android/ant/apk-build.xml (right):

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
build/android/ant/apk-build.xml:333: <target
Nit: definition can be one line

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
build/android/ant/apk-build.xml:561: <target name="-do-sign"
Nit: oneline

[shashi, 2013-03-13 19:04:20]

lgtm

[cjhopman, 2013-03-13 19:04:55]

On 2013/03/13 18:58:29, Yaron wrote:
> I'm not entirely clear on the use of <sequential> task. Should we be guarding
> some of our merged targets in <sequential> blocks or since we don't use
> <parallel> there's no need? I don't understand why the sdk had some use of
> sequential, I guess for nicely including in the clients' build?
> 
Ant's macrodef requires that its contents are in a sequential task, so some of
the current <sequential>s are from inlining the macros. Like you said, since
there are no <parallel> the <sequential>s don't actually do anything.

[cjhopman, 2013-03-13 19:07:53]

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
File build/android/ant/apk-build.xml (left):

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
build/android/ant/apk-build.xml:289: <res path="${resource.absolute.dir}" />
On 2013/03/13 18:58:30, Yaron wrote:
> This dir is no longer being created in -setup. Seems fine though as we're
> actually passing in from gyp, right?
Yes, this always points to a directory that exists.

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
File build/android/ant/apk-build.xml (right):

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
build/android/ant/apk-build.xml:333: <target
On 2013/03/13 18:58:30, Yaron wrote:
> Nit: definition can be one line

Done.

https://codereview.chromium.org/12808004/diff/2001/build/android/ant/apk-buil...
build/android/ant/apk-build.xml:561: <target name="-do-sign"
On 2013/03/13 18:58:30, Yaron wrote:
> Nit: oneline

Done.

[Yaron, 2013-03-13 19:12:10]

lgtm

[commit-bot: I haz the power, 2013-03-15 17:16:54]

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

[commit-bot: I haz the power, 2013-03-15 17:47:24]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_clang_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...
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, 2013-03-15 18:12:44]

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

[commit-bot: I haz the power, 2013-03-15 18:38:36]

Retried try job too often on mac_rel for step(s) content_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-03-15 23:46:30]

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

[commit-bot: I haz the power, 2013-03-16 05:37:52]

Change committed as 188548