summaryrefslogtreecommitdiffstats
path: root/build/java_apk.gypi
Commit message (Collapse)AuthorAgeFilesLines
* Remove unneeded symbolic link to libraries.cjhopman@chromium.org2012-11-071-3/+0
| | | | | | | | | | | | | The stack annotation tool has been changed to work with Chrome output directory structure and so we no longer need to create the artificial structure in out/android. BUG= Review URL: https://chromiumcodereview.appspot.com/11368102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166423 0039d316-1c4b-4281-b951-d872f2087c98
* Remove -debug suffix in apk names.shashishekhar@chromium.org2012-10-181-4/+2
| | | | | | | | | | | | -debug suffix is used even for Release builds, remove this suffix now apk name will have no suffix in either Debug or Release builds. BUG=155946 Review URL: https://chromiumcodereview.appspot.com/11221003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162803 0039d316-1c4b-4281-b951-d872f2087c98
* Make resource directory option in gyp template optional.shashishekhar@chromium.org2012-10-171-2/+7
| | | | | | | | | | Resource directory may not always be defined for an apk, make it optional. BUG=156061 Review URL: https://chromiumcodereview.appspot.com/11189010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162477 0039d316-1c4b-4281-b951-d872f2087c98
* Move shared library copy and strip to java_apk.gypicjhopman@chromium.org2012-10-111-4/+35
| | | | | | | | | | | | | Also, for each such shared library included in an apk, create a link in the appropriate directory in <(android_product_out) to enable annotating native stack traces for those apks. BUG= Review URL: https://chromiumcodereview.appspot.com/11096038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161440 0039d316-1c4b-4281-b951-d872f2087c98
* Add Proguard option to gyp template.shashishekhar@chromium.org2012-10-101-0/+8
| | | | | | | | | | | | Add proguard specific options to java_apk.gypi so that an apk can specify proguard flags. BUG=149214 Review URL: https://chromiumcodereview.appspot.com/11100002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161004 0039d316-1c4b-4281-b951-d872f2087c98
* Fix chromium testshell crash on startup.yfriedman@chromium.org2012-10-091-1/+1
| | | | | | | | After http://codereview.chromium.org/10876056/, we need to include chrome's pak files in testshell. Review URL: https://codereview.chromium.org/11092032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160958 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for building apk in releasecjhopman@chromium.org2012-10-091-1/+7
| | | | | | | | | | | | Until now, even in a Release configuration, apks were built in debug. Now, they will be built in the correct configuration. BUG= TBR=torne Review URL: https://chromiumcodereview.appspot.com/11017016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160913 0039d316-1c4b-4281-b951-d872f2087c98
* Make apks build from a single ant .xml templatecjhopman@chromium.org2012-10-051-4/+10
| | | | | | | | | | | | | | | | 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 Review URL: https://chromiumcodereview.appspot.com/10959034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160396 0039d316-1c4b-4281-b951-d872f2087c98
* Add more generic support for java targets bundling multiple directoriescjhopman@chromium.org2012-09-281-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | 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: svn://svn.chromium.org/chrome/trunk/src@159299 0039d316-1c4b-4281-b951-d872f2087c98
* Add test jar generation logic for ant builds.shashishekhar@chromium.org2012-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | | Add a new property generate.test.jar to ant scripts. When this property is set, a jar containing all compiled classes and referred classes is generated and placed in out/{Debug|Release}/test.lib.java directory. This makes it easier and cleaner to write ant build files for test apks. New directory structure for the build: Apks are placed in : out/{Debug|Release}/apks All java libraries in : out/{Debug|Release}/lib.java All test java libraries in : out/{Debug|Release}/test.lib.java This CL also includes cleanup to work with the modified output directory structure. BUG=146583 Review URL: https://chromiumcodereview.appspot.com/10905138 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157570 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 156308 - Revert 156233 - Make apks be built in a consistent waycjhopman@chromium.org2012-09-191-0/+75
| | | | | | | | | | | | | | | | | | | | This broke non-incremental Android builds. In the original CL there was a discrepancy in the way that Gyp handled paths and the way that Ant handled paths. Changed it so that resource_dir is specified relative to java_in_dir so that Gyp and Ant treat it the same. For http://crbug.com/145991 I will have to make resource_dir be in a consistent location for all apk targets and at that point it can be removed from the gyp files. Original:https://chromiumcodereview.appspot.com/10914130 BUG= Review URL: https://chromiumcodereview.appspot.com/10913225 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157502 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 156233 - Make apks be built in a consistent waypeter@chromium.org2012-09-121-75/+0
| | | | | | | | | | | | | | | | | | | This broke non-incremental Android builds. Simplify apk targets by doing most of the work in build/java_apk.gypi (like jars are done with build/java.gypi). The apk targets still use their own ant build files, but everything else is more consistent between them. BUG= Review URL: https://chromiumcodereview.appspot.com/10914130 TBR=cjhopman@chromium.org Review URL: https://chromiumcodereview.appspot.com/10916264 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156308 0039d316-1c4b-4281-b951-d872f2087c98
* Make apks be built in a consistent waycjhopman@chromium.org2012-09-121-0/+75
Simplify apk targets by doing most of the work in build/java_apk.gypi (like jars are done with build/java.gypi). The apk targets still use their own ant build files, but everything else is more consistent between them. BUG= Review URL: https://chromiumcodereview.appspot.com/10914130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156233 0039d316-1c4b-4281-b951-d872f2087c98