Chromium Code Reviews| Index: build/java.gypi |
| diff --git a/build/java.gypi b/build/java.gypi |
| index a13c88f852fd9880c90bbf53f44cab683a159a04..21dc3437e2049dd38ab4fd18f517ccf90309d46f 100644 |
| --- a/build/java.gypi |
| +++ b/build/java.gypi |
| @@ -65,12 +65,13 @@ |
| 'generated_R_dirs': [], |
| 'additional_R_files': [], |
| 'has_java_resources%': 0, |
| + 'grit_grd_file%': '', |
| }, |
| 'conditions': [ |
| ['has_java_resources == 1', { |
| 'variables': { |
| 'res_dir': '<(java_in_dir)/res', |
| - 'crunched_res_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/res', |
| + 'out_res_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/res', |
| 'R_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/java_R', |
| 'R_file': '<(R_dir)/<(R_package_relpath)/R.java', |
| 'generated_src_dirs': ['<(R_dir)'], |
| @@ -85,7 +86,7 @@ |
| # Dependent APKs include this target's resources via |
| # additional_res_dirs and additional_res_packages. |
| - 'additional_res_dirs': ['<(crunched_res_dir)', '<(res_dir)'], |
| + 'additional_res_dirs': ['<(out_res_dir)', '<(res_dir)'], |
| 'additional_res_packages': ['<(R_package)'], |
| }, |
| }, |
| @@ -94,6 +95,16 @@ |
| { |
| 'action_name': 'process_resources', |
| 'message': 'processing resources for <(package_name)', |
| + 'conditions': [ |
| + ['grit_grd_file != ""', { |
| + 'inputs': [ |
| + # TODO(newt): replace this with .../values/strings.xml once |
| + # the English strings.xml is generated as well? That would be |
| + # simpler and faster and should be equivalent. |
| + '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(out_res_dir)" <(grit_grd_file))', |
|
newt (away)
2012/12/21 08:12:41
It would be nice if this duplication could be elim
|
| + ], |
| + }], |
| + ], |
| 'inputs': [ |
| '<(DEPTH)/build/android/process_resources.py', |
| '<!@(find <(res_dir) -type f)', |
| @@ -108,10 +119,25 @@ |
| '--R-package', '<(R_package)', |
| '--R-dir', '<(R_dir)', |
| '--res-dir', '<(res_dir)', |
| - '--crunched-res-dir', '<(crunched_res_dir)', |
| + '--crunched-res-dir', '<(out_res_dir)', |
| ], |
| }, |
| ], |
| + 'conditions': [ |
| + ['grit_grd_file != ""', { |
| + 'actions': [ |
| + { |
| + 'action_name': 'generate_localized_strings_xml', |
| + 'variables': { |
| + 'grit_out_dir': '<(out_res_dir)', |
| + # resource_ids is unneeded since we don't generate .h headers. |
| + 'grit_resource_ids': '', |
| + }, |
| + 'includes': ['../build/grit_action.gypi'], |
| + }, |
| + ], |
| + }], |
| + ], |
| }], |
| ], |
| 'actions': [ |