Chromium Code Reviews| Index: remoting/remoting.gyp |
| diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp |
| index 37069e469ae9856eea50995e15b3f4c93b45dd6b..fdb847d3b85ca92cdc0fc9dd7b9683bba7af5ad8 100644 |
| --- a/remoting/remoting.gyp |
| +++ b/remoting/remoting.gyp |
| @@ -1268,34 +1268,36 @@ |
| ], |
| 'actions': [ |
| { |
| - 'action_name': 'generate_resources', |
| + 'action_name': 'string_resources', |
|
Jamie
2012/10/10 20:40:22
Nit: Is there a convention that action names shoul
Sergey Ulanov
2012/10/10 23:10:03
There is no such convention. In fact most action n
|
| 'variables': { |
| - 'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'], |
| + 'grit_grd_file': '<(strings_grd_file)', |
| + 'base_grit_grd_file': '<(base_strings_grd_file)', |
| }, |
| - 'inputs': [ |
| - '<(strings_grd_file)', |
| - '<(resource_ids_file)', |
| - ], |
| - 'outputs': [ |
| - '<!@pymod_do_main(grit_info <@(grit_defines) ' |
| - '--outputs \'<(grit_out_dir)\' <(base_strings_grd_file))', |
| - ], |
| - 'action': ['<@(grit_cmd)', |
| - '-i', '<(strings_grd_file)', 'build', |
| - '-fresource_ids', |
| - '-o', '<(grit_out_dir)', |
| - '<@(grit_defines)' ], |
| - 'msvs_cygwin_shell': 0, |
| - 'message': 'Generating resources from <(strings_grd_file)', |
| + 'includes': [ 'grit_action.gypi' ], |
| + }, |
| + { |
| + 'action_name': 'common_resources', |
| + 'variables': { |
| + 'grit_grd_file': 'resources/common_resources.grd', |
| + 'base_grit_grd_file': 'resources/common_resources.grd', |
| + }, |
| + 'includes': [ 'grit_action.gypi' ], |
| }, |
| ], |
| 'copies': [ |
| - { # Copy results to the product directory. |
| + # Copy results to the product directory. |
| + { |
| 'destination': '<(PRODUCT_DIR)/remoting_locales', |
| 'files': [ |
| '<(grit_out_dir)/remoting/resources/en-US.pak', |
| ] |
| }, |
| + { |
| + 'destination': '<(PRODUCT_DIR)', |
| + 'files': [ |
| + '<(grit_out_dir)/remoting/resources/chrome_remote_desktop.pak', |
| + ] |
| + }, |
| ], |
| 'includes': [ '../build/grit_target.gypi' ], |
| }, # end of target 'remoting_resources' |