diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 19:50:08 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 19:50:08 +0000 |
| commit | 40f16275c152142599af2c810c53b1ed138079c6 (patch) | |
| tree | f5e1dee0e6f0d3f613adda271478d5e56ca4e988 /build/java.gypi | |
| parent | 717c964116407ed4294d8c7b7e82919c08ff0c40 (diff) | |
| download | chromium_src-40f16275c152142599af2c810c53b1ed138079c6.zip chromium_src-40f16275c152142599af2c810c53b1ed138079c6.tar.gz chromium_src-40f16275c152142599af2c810c53b1ed138079c6.tar.bz2 | |
Convert apk-package-resources.xml to python
This ant script is basically a simple wrapper around an aapt call (the
only thing the large AaptExecTask custom ant task adds is a bunch of
dependency checking that we don't actually want anyway). This
makes it use python instead.
BUG=359249,375324,375431
NOTRY=true
Review URL: https://codereview.chromium.org/291963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/build/java.gypi b/build/java.gypi index ce778b1..d392206 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -140,9 +140,14 @@ # Dependent APKs include this target's resources via # additional_res_dirs, additional_res_packages, and # additional_R_text_files. - 'additional_res_dirs': ['<(res_crunched_dir)', - '<(res_v14_compatibility_dir)', - '<@(res_input_dirs)'], + 'additional_res_dirs': [ + # The order of these is important to ensure that the proper + # version (i.e. the crunched version) of resources takes + # precedence. + '<(res_crunched_dir)', + '<(res_v14_compatibility_dir)', + '<@(res_input_dirs)' + ], 'additional_res_packages': ['<(R_package)'], 'additional_R_text_files': ['<(R_text_file)'], }, |