diff options
author | garykac <garykac@chromium.org> | 2015-06-16 14:53:29 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-16 21:54:07 +0000 |
commit | 5b696cf0d943d03a7bd388bdca1ffc6d95d3fc9c (patch) | |
tree | accc81b84a91e236c0641c90d6936fdd61bbca2b /remoting/app_remoting_webapp_build.gypi | |
parent | 79a014fa0958f70466f9ed1a4ade15eb1d4dc34c (diff) | |
download | chromium_src-5b696cf0d943d03a7bd388bdca1ffc6d95d3fc9c.zip chromium_src-5b696cf0d943d03a7bd388bdca1ffc6d95d3fc9c.tar.gz chromium_src-5b696cf0d943d03a7bd388bdca1ffc6d95d3fc9c.tar.bz2 |
[AppRemoting] Break out AppRemoting shared module.
This is a reland of crrev.com/1176143002 with missing files added:
remoting/webapp/app_remoting/shared_module/manifest.json
This cl breaks out the shared AppRemoting code into a shared module so
that it does not need to be duplicated in each individual app.
This version has the following limitations which will be addressed in
follow-up cls:
(1) The apps have a hard-coded reference to the dev shared module
(2) The apps have a hard-coded reference to the dev orchestrator
(3) The resources in the app stub should be replaced with empty stub
resources rather than a copy of all the shared resources.
(4) The shared module is only built in GN (not GYP)
BUG=
Review URL: https://codereview.chromium.org/1179873005
Cr-Commit-Position: refs/heads/master@{#334708}
Diffstat (limited to 'remoting/app_remoting_webapp_build.gypi')
-rw-r--r-- | remoting/app_remoting_webapp_build.gypi | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/remoting/app_remoting_webapp_build.gypi b/remoting/app_remoting_webapp_build.gypi index bc6ffa6..50fb6d3 100644 --- a/remoting/app_remoting_webapp_build.gypi +++ b/remoting/app_remoting_webapp_build.gypi @@ -40,18 +40,10 @@ '>(ar_app_path)/icon128.png', '>(ar_app_path)/loading_splash.png', ], - 'ar_generated_html_files': [ - '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html', - '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/main.html', - '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/message_window.html', - '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/wcs_sandbox.html', - '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/feedback_consent.html', - ], 'ar_webapp_files': [ '<@(ar_app_specific_files)', - '<@(ar_shared_resource_files)', - '<@(ar_all_js_files)', - '<@(ar_generated_html_files)', + '<@(ar_vendor_js_files)', + '<@(ar_vendor_html_files)', ], 'output_dir': '<(PRODUCT_DIR)/app_streaming/<@(ar_service_environment)/>(_target_name)', 'zip_path': '<(PRODUCT_DIR)/app_streaming/<@(ar_service_environment)/>(_target_name).zip', @@ -102,7 +94,6 @@ '<(remoting_version_path)', '<@(ar_webapp_files)', '<@(remoting_webapp_locale_files)', - '<@(ar_generated_html_files)', '<(ar_app_manifest_app)', '<(DEPTH)/remoting/<(ar_app_manifest_common)', '<(ar_webapp_locales_listfile)', @@ -162,6 +153,25 @@ ], }, { + 'action_name': 'Build ">(ar_app_name)" ar_background.html', + 'inputs': [ + '<(DEPTH)/remoting/webapp/build-html.py', + '<(ar_background_template)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/ar_background.html', + ], + 'action': [ + 'python', '<(DEPTH)/remoting/webapp/build-html.py', + '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/ar_background.html', + '<(ar_background_template)', + '--template-dir', + '<(DEPTH)/remoting', + '--js', + '<@(ar_background_html_js_files)', + ], + }, + { 'action_name': 'Build ">(ar_app_name)" wcs_sandbox.html', 'inputs': [ '<(DEPTH)/remoting/webapp/build-html.py', |