diff options
Diffstat (limited to 'build/java_strings_grd.gypi')
-rw-r--r-- | build/java_strings_grd.gypi | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/build/java_strings_grd.gypi b/build/java_strings_grd.gypi index ff374e3..7534be5 100644 --- a/build/java_strings_grd.gypi +++ b/build/java_strings_grd.gypi @@ -19,30 +19,44 @@ # grd_file - The path to the grd file to use. { 'variables': { - 'intermediate_dir': '<(PRODUCT_DIR)/<(_target_name)', - 'res_grit_dir': '<(intermediate_dir)/res_grit', + 'res_grit_dir': '<(INTERMEDIATE_DIR)/<(_target_name)/res_grit', 'grit_grd_file': '<(grd_file)', - 'resource_input_paths': [ - '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(res_grit_dir)" <(grd_file))' - ], + 'resource_zip_path': '<(PRODUCT_DIR)/res.java/<(_target_name).zip', + 'grit_additional_defines': ['-E', 'ANDROID_JAVA_TAGGED_ONLY=false'], + 'grit_out_dir': '<(res_grit_dir)', + # resource_ids is unneeded since we don't generate .h headers. + 'grit_resource_ids': '', + 'grit_outputs': [ + '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) ' + '--outputs \'<(grit_out_dir)\' ' + '<(grit_grd_file) -f "<(grit_resource_ids)")', + ] }, 'all_dependent_settings': { 'variables': { - 'additional_res_dirs': ['<@(res_grit_dir)'], - 'dependencies_res_files': ['<@(resource_input_paths)'], - 'dependencies_res_input_dirs': ['<@(res_grit_dir)'], + 'additional_input_paths': ['<(resource_zip_path)'], + 'dependencies_res_zip_paths': ['<(resource_zip_path)'], }, }, 'actions': [ { 'action_name': 'generate_localized_strings_xml', - 'variables': { - 'grit_additional_defines': ['-E', 'ANDROID_JAVA_TAGGED_ONLY=false'], - 'grit_out_dir': '<(res_grit_dir)', - # resource_ids is unneeded since we don't generate .h headers. - 'grit_resource_ids': '', - }, 'includes': ['../build/grit_action.gypi'], }, + { + 'action_name': 'create_resources_zip', + 'inputs': [ + '<(DEPTH)/build/android/gyp/zip.py', + '<@(grit_outputs)', + ], + 'outputs': [ + '<(resource_zip_path)', + ], + 'action': [ + 'python', '<(DEPTH)/build/android/gyp/zip.py', + '--input-dir', '<(res_grit_dir)', + '--output', '<(resource_zip_path)', + ], + } ], } |