| Index: build/java.gypi
|
| diff --git a/build/java.gypi b/build/java.gypi
|
| index fdcbe576652a7438bd60734f59797f7e171c5215..c5e406310f3b093ed8c68e41e227c36f53ba6904 100644
|
| --- a/build/java.gypi
|
| +++ b/build/java.gypi
|
| @@ -83,6 +83,7 @@
|
| 'variables': {
|
| 'res_dir': '<(java_in_dir)/res',
|
| 'res_crunched_dir': '<(intermediate_dir)/res_crunched',
|
| + 'res_mirrored_dir': '<(intermediate_dir)/res_mirrored',
|
| 'res_input_dirs': ['<(res_dir)', '<@(res_extra_dirs)'],
|
| 'resource_input_paths': ['<!@(find <(res_dir) -type f)'],
|
| 'R_dir': '<(intermediate_dir)/java_R',
|
| @@ -105,7 +106,9 @@
|
| # 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_input_dirs)'],
|
| + 'additional_res_dirs': ['<(res_crunched_dir)',
|
| + '<(res_mirrored_dir)',
|
| + '<@(res_input_dirs)'],
|
| 'additional_res_packages': ['<(R_package)'],
|
| 'additional_R_text_files': ['<(R_text_file)'],
|
| },
|
| @@ -158,8 +161,9 @@
|
| '--android-sdk-tools', '<(android_sdk_tools)',
|
| '--R-dir', '<(R_dir)',
|
| '--res-dirs', '>(all_res_dirs)',
|
| - '--crunch-input-dir', '>(res_dir)',
|
| + '--crunch-and-mirror-input-dir', '>(res_dir)',
|
| '--crunch-output-dir', '<(res_crunched_dir)',
|
| + '--mirror-output-dir', '<(res_mirrored_dir)',
|
| '--android-manifest', '<(android_manifest)',
|
| '--non-constant-id',
|
| '--custom-package', '<(R_package)',
|
|
|