diff options
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/java.gypi b/build/java.gypi index ce778b1..8f61395 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -156,8 +156,8 @@ 'android_manifest': '<(DEPTH)/build/android/AndroidManifest.xml', # Include the dependencies' res dirs so that references to # resources in dependencies can be resolved. - 'dependencies_res_dirs': ['<@(res_extra_dirs)', - '>@(dependencies_res_input_dirs)',], + 'all_res_dirs': ['<@(res_input_dirs)', + '>@(dependencies_res_input_dirs)',], # Write the inputs list to a file, so that its mtime is updated when # the list of inputs changes. 'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))' @@ -177,8 +177,8 @@ '--android-sdk', '<(android_sdk)', '--android-sdk-tools', '<(android_sdk_tools)', '--R-dir', '<(R_dir)', - '--dependencies-res-dirs', '>(dependencies_res_dirs)', - '--resource-dir', '<(res_dir)', + '--res-dirs', '>(all_res_dirs)', + '--crunch-input-dir', '>(res_dir)', '--crunch-output-dir', '<(res_crunched_dir)', '--android-manifest', '<(android_manifest)', '--non-constant-id', |