diff options
| author | garykac <garykac@chromium.org> | 2015-03-06 11:42:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-06 19:43:47 +0000 |
| commit | 9547d1f683be7c99e28054d7cc78ffcc2be2ccff (patch) | |
| tree | 10fdb16f697f30d8b47d40db95e6f4393825747d /remoting/remoting_client.gypi | |
| parent | a91e21d0889c9fc971df96fc8783637889bb8433 (diff) | |
| download | chromium_src-9547d1f683be7c99e28054d7cc78ffcc2be2ccff.zip chromium_src-9547d1f683be7c99e28054d7cc78ffcc2be2ccff.tar.gz chromium_src-9547d1f683be7c99e28054d7cc78ffcc2be2ccff.tar.bz2 | |
[Chromoting] Use build-html.py to generate message_window.html
This cl also cleans up some of the gyp variables related to managing JS files for HTML files:
* Remove unused params to build-html.py
* Group related vars in remoting_webapp_files.gypi
BUG=
Review URL: https://codereview.chromium.org/977903003
Cr-Commit-Position: refs/heads/master@{#319480}
Diffstat (limited to 'remoting/remoting_client.gypi')
| -rw-r--r-- | remoting/remoting_client.gypi | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi index e8f3efb..aa4cf13 100644 --- a/remoting/remoting_client.gypi +++ b/remoting/remoting_client.gypi @@ -70,8 +70,7 @@ '--template-dir', '<(DEPTH)/remoting', '--templates', '<@(remoting_webapp_template_files)', '--js', - '<@(remoting_webapp_shared_main_html_js_files)', - '<@(remoting_webapp_crd_main_html_js_files)', + '<@(remoting_webapp_crd_main_html_all_js_files)', ], }, { @@ -87,7 +86,7 @@ 'python', 'webapp/build-html.py', '<(SHARED_INTERMEDIATE_DIR)/wcs_sandbox.html', '<(remoting_webapp_template_wcs_sandbox)', - '--js', '<@(remoting_webapp_wcs_sandbox_html_js_files)', + '--js', '<@(remoting_webapp_wcs_sandbox_html_all_js_files)', ], }, { @@ -103,10 +102,26 @@ 'python', 'webapp/build-html.py', '<(SHARED_INTERMEDIATE_DIR)/background.html', '<(remoting_webapp_template_background)', - '--js', '<@(remoting_webapp_background_js_files)', + '--js', '<@(remoting_webapp_background_html_all_js_files)', ], }, - ], + { + 'action_name': 'Build Remoting Webapp message_window.html', + 'inputs': [ + 'webapp/build-html.py', + '<(remoting_webapp_template_message_window)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/message_window.html', + ], + 'action': [ + 'python', 'webapp/build-html.py', + '<(SHARED_INTERMEDIATE_DIR)/message_window.html', + '<(remoting_webapp_template_message_window)', + '--js', '<@(remoting_webapp_message_window_html_all_js_files)', + ], + }, + ], # end of actions }, # end of target 'remoting_webapp_html' { |