Add more generic support for java targets bundling multiple directories

Add more generic support for java targets bundling multiple directories

Currently chromium_testshell_test_apk and content_shell_test_apk compile
and package java files from two different directories. Supporting this
in a good way is a requirement for using a single ant template for all
apks.

Introduce a new gyp variable for apk/jar targets, generated_src_dirs.
Now, generated_src_dirs is for directories that contain .java files that
are generated at build time and additional_src_dirs is for extra normal
directories to include in the jar/apk.

Change content_shell_test_apk and chromium_testshell_test_apk to use
additional_src_dirs for their extra dirs.

Add documentation for the gyp variables for jar/apk targets.

Reorder the ant defines in the java.gypi and java_apk.gypi.

BUG=136756, 146056
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=159299

[cjhopman, 2012-09-27 22:07:14]

yfriedman: content/shell/android, build/, chrome/android

[Yaron, 2012-09-27 23:31:30]

lgtm

http://codereview.chromium.org/10987083/diff/1/build/java.gypi
File build/java.gypi (right):

http://codereview.chromium.org/10987083/diff/1/build/java.gypi#newcode20
build/java.gypi:20: #   <(PRODUCT_DIR)/lib.java/chromium_base.jar
replace "base" with package name

[joth, 2012-09-27 23:51:59]

drive-by

http://codereview.chromium.org/10987083/diff/1/build/java_apk.gypi
File build/java_apk.gypi (right):

http://codereview.chromium.org/10987083/diff/1/build/java_apk.gypi#newcode49
build/java_apk.gypi:49: #    target.
as the comment is duplicated with build/java.gypi, is it worth replacing with
link to other (say in addition any of the option variable from <> can be used)
or add a warning to the other that when adding a new one, it should be added in
here too?

[cjhopman, 2012-09-28 01:07:20]

joth:android_webview/
jam:content/
sky:chrome/
jar:net/

http://codereview.chromium.org/10987083/diff/1/build/java.gypi
File build/java.gypi (right):

http://codereview.chromium.org/10987083/diff/1/build/java.gypi#newcode20
build/java.gypi:20: #   <(PRODUCT_DIR)/lib.java/chromium_base.jar
On 2012/09/27 23:31:30, Yaron wrote:
> replace "base" with package name

Done.

http://codereview.chromium.org/10987083/diff/1/build/java_apk.gypi
File build/java_apk.gypi (right):

http://codereview.chromium.org/10987083/diff/1/build/java_apk.gypi#newcode49
build/java_apk.gypi:49: #    target.
On 2012/09/27 23:51:59, joth wrote:
> as the comment is duplicated with build/java.gypi, is it worth replacing with
> link to other (say in addition any of the option variable from <> can be used)
> or add a warning to the other that when adding a new one, it should be added
in
> here too?
> 

Currently, apks have some additional variables (apk_name, resource_dir,
native_libs_paths) and there isn't really a requirement that they stay in sync
(though they should stay as similar as possible).

I think my preference would be to not point users to multiple places for
figuring out how to use these includes.

[joth, 2012-09-28 01:39:10]

lgtm

[sky, 2012-09-28 15:03:12]

chrome/ LGTM

[jam, 2012-09-28 15:50:50]

lgtm

[commit-bot: I haz the power, 2012-09-28 15:53:11]

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

[commit-bot: I haz the power, 2012-09-28 15:53:16]

Presubmit check for 10987083-7002 failed and returned exit status 1.


Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    net

[jar (doing other things), 2012-09-28 16:08:15]

net lgtm

[commit-bot: I haz the power, 2012-09-28 16:27:46]

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

[commit-bot: I haz the power, 2012-09-28 18:22:33]

Change committed as 159299