We were using package_name as a unique name for naming output files and
directories. package_name was typically the same as _target_name or a
variation of it (like dropping _apk). Using _target_name instead means
we need to specify one less thing and it is (maybe?) guaranteed to be
unique.
TBR=brettw,joi,jar,fischman,zea,sky
BUG=
Review URL: https://chromiumcodereview.appspot.com/11308030
git-svn-id: http://src.chromium.org/svn/trunk/src/build@183639 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
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
Review URL: https://chromiumcodereview.appspot.com/10987083
git-svn-id: http://src.chromium.org/svn/trunk/src/build@159299 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Native code generation rules typically add their output directory to
their dependent's 'include_dirs'. This change makes targets that include
java_aidl.gypi do a similar thing for other java*.gypi targets.
Make java.gypi pass this variable to ant and content.xml use the
variable rather than hardcoding the directory.
Also, move the aidl output folder into <(SHARED_INTERMEDIATE_DIR) as it
should be.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10855060
git-svn-id: http://src.chromium.org/svn/trunk/src/build@151315 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
The Java file generation rule in java_aidl.gypi assumes the wrong output path
for the generated file. This leads to spurious rebuilds.
The problem is that by default, the aidl tool outputs the Java file to
<output-path>/<package-path>/<input-file-root>.java, not to
<output-path>/<input-file-root>.java as assumed by the rule. This change fixes
the problem by explicitly specifying the output path to aidl.
Also remove superfluous path components on input files.
Review URL: https://chromiumcodereview.appspot.com/10690092
git-svn-id: http://src.chromium.org/svn/trunk/src/build@145982 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
cjhopman@chromium.org
dtrainor@chromium.org
steveblock@chromium.org
michaelbai@chromium.org