Index: remoting/webapp/build_template.gni |
diff --git a/remoting/webapp/build_template.gni b/remoting/webapp/build_template.gni |
index 612a795842f0064efb412352182d3c808789251a..48dc9c6d9e657512ff1f07cac725a54404f55882 100644 |
--- a/remoting/webapp/build_template.gni |
+++ b/remoting/webapp/build_template.gni |
@@ -212,7 +212,6 @@ template("desktop_remoting_webapp") { |
action(target_name) { |
script = "//remoting/webapp/build-webapp.py" |
- webapp_type = invoker.webapp_type |
output_dir = invoker.output_dir |
zip_path = invoker.zip_path |
extra_files = invoker.extra_files |
@@ -280,7 +279,6 @@ template("desktop_remoting_webapp") { |
rebase_path(output_dir, root_build_dir), |
rebase_path(zip_path, root_build_dir), |
rebase_path("crd/manifest.json.jinja2", root_build_dir), |
- webapp_type, |
] |
args += [ |
"--files_listfile", |
@@ -296,297 +294,3 @@ template("desktop_remoting_webapp") { |
] |
} |
} |
- |
-template("app_remoting_webapp") { |
- locales_listfile = target_name + "_locales" |
- locales_listfile_output = "$target_gen_dir/${target_name}_locales.txt" |
- |
- build_locales_listfile(locales_listfile) { |
- # TODO(garykac) Replace resources with empty stub rather than duplicating |
- # all the resources needed by the shared module. |
- # Template uses locales_listfile_output from outer scope. |
- } |
- |
- action(target_name) { |
- script = "//remoting/webapp/build-webapp.py" |
- |
- app_key = invoker.app_key |
- app_id = invoker.app_id |
- app_client_id = invoker.app_client_id |
- app_vendor = invoker.app_vendor |
- app_name = invoker.app_name |
- app_fullname = invoker.app_fullname |
- app_description = invoker.app_description |
- app_capabilities = invoker.app_capabilities |
- manifest_key = invoker.manifest_key |
- |
- # These asserts are so that these variables get marked as being used so |
- # that GN doesn't complain about them. |
- assert(app_key != "" || app_key == "") |
- assert(app_id != "" || app_id == "") |
- |
- ar_base_path = "//remoting/webapp/app_remoting" |
- if (app_vendor != "") { |
- ar_app_path = "$ar_base_path/internal/apps/$app_vendor/$app_name" |
- } else { |
- ar_app_path = "$ar_base_path/apps/$app_name" |
- } |
- ar_app_manifest = "$ar_app_path/manifest.json.jinja2" |
- ar_app_manifest_common = "$ar_base_path/manifest_common.json.jinja2" |
- |
- output_dir = "$root_build_dir/remoting/app_remoting/" + |
- "$ar_service_environment/$target_name" |
- zip_path = "$root_build_dir/remoting/app_remoting/" + |
- "$ar_service_environment/$target_name.zip" |
- |
- # TODO(garykac) Move this list of files into files.gni. |
- ar_app_specific_files = [ |
- "$ar_app_path/icon16.png", |
- "$ar_app_path/icon48.png", |
- "$ar_app_path/icon128.png", |
- "$ar_app_path/loading_splash.png", |
- ] |
- |
- ar_webapp_files = |
- ar_app_specific_files + ar_vendor_js_files + ar_vendor_html_files |
- |
- inputs = [ |
- rebase_path(ar_app_manifest, root_build_dir), |
- rebase_path(ar_app_manifest_common, root_build_dir), |
- ] + remoting_version_files + ar_webapp_files |
- |
- outputs = [ |
- zip_path, |
- ] |
- |
- deps = [ |
- ":$locales_listfile", |
- "//remoting/resources", |
- ] |
- |
- # Create a file that contains a list of all the resource files needed |
- # to build the webapp. This is needed to avoid problems on platforms that |
- # limit the size of a command line. |
- file_list = "$target_gen_dir/${target_name}_files.txt" |
- files = [] |
- files += rebase_path(ar_webapp_files, root_build_dir) |
- write_file(file_list, files) |
- |
- args = [ |
- buildtype, |
- chrome_version_full, |
- rebase_path(output_dir, root_build_dir), |
- rebase_path(zip_path, root_build_dir), |
- rebase_path(ar_app_manifest, root_build_dir), |
- "app_remoting", # Web app type |
- ] |
- args += [ |
- "--files_listfile", |
- rebase_path(file_list, root_build_dir), |
- ] |
- args += [ |
- "--locales_listfile", |
- rebase_path(locales_listfile_output, root_build_dir), |
- ] |
- args += [ |
- "--jinja_paths", |
- rebase_path("//remoting/webapp/app_remoting", root_build_dir), |
- ] |
- |
- if (is_debug) { |
- # Normally, the app-id for the orchestrator is automatically extracted |
- # from the webapp's extension id, but that approach doesn't work for |
- # dev webapp builds (since they all share the same dev extension id). |
- # The --appid arg will create a webapp that registers the given app-id |
- # rather than using the extension id. |
- # This is only done for Dev apps because the app-id for Release apps |
- # *must* match the extension id. |
- args += [ |
- "--appid", |
- app_id, |
- ] |
- } |
- |
- args += [ |
- "--app_name", |
- app_fullname, |
- ] |
- args += [ |
- "--app_description", |
- app_description, |
- ] |
- args += [ "--app_capabilities" ] + app_capabilities |
- args += [ |
- "--service_environment", |
- ar_service_environment, |
- ] |
- args += [ |
- "--manifest_key", |
- manifest_key, |
- ] |
- args += [ |
- "--app_client_id", |
- app_client_id, |
- ] |
- } |
-} |
- |
-template("app_remoting_shared_module") { |
- # TODO(garykac): Include the PNaCl plugin in the shared module once we have |
- # a GN toolchain (crbug.com/471924). |
- |
- locales_listfile = target_name + "_locales" |
- locales_listfile_output = "$target_gen_dir/${target_name}_locales.txt" |
- |
- build_locales_listfile(locales_listfile) { |
- # Template uses locales_listfile_output from outer scope. |
- } |
- |
- feedback_consent_html = target_name + "_feedback_consent_html" |
- feedback_consent_html_output = |
- "$target_gen_dir/html/$target_name/feedback_consent.html" |
- |
- build_webapp_html(feedback_consent_html) { |
- html_template_file = ar_feedback_consent_template |
- html_template_include_files = [] |
- js_files = ar_feedback_consent_html_all_js_files |
- html_output = feedback_consent_html_output |
- exclude_js = [] |
- instrument_js = [] |
- } |
- |
- loading_window_html = target_name + "_loading_window_html" |
- loading_window_html_output = |
- "$target_gen_dir/html/$target_name/loading_window.html" |
- |
- build_webapp_html(loading_window_html) { |
- html_template_file = ar_loading_window_template |
- html_template_include_files = [] |
- |
- # The loading window is just a reskin of the message window -- all JS code |
- # is shared. |
- js_files = remoting_webapp_message_window_html_all_js_files |
- html_output = loading_window_html_output |
- exclude_js = [] |
- instrument_js = [] |
- } |
- |
- message_window_html = target_name + "_message_window_html" |
- message_window_html_output = |
- "$target_gen_dir/html/$target_name/message_window.html" |
- |
- build_webapp_html(message_window_html) { |
- html_template_file = remoting_webapp_template_message_window |
- html_template_include_files = [] |
- js_files = remoting_webapp_message_window_html_all_js_files |
- html_output = message_window_html_output |
- exclude_js = [] |
- instrument_js = [] |
- } |
- |
- wcs_sandbox_html = target_name + "_wcs_sandbox_html" |
- wcs_sandbox_html_output = "$target_gen_dir/html/$target_name/wcs_sandbox.html" |
- |
- build_webapp_html(wcs_sandbox_html) { |
- html_template_file = remoting_webapp_template_wcs_sandbox |
- html_template_include_files = [] |
- js_files = remoting_webapp_wcs_sandbox_html_all_js_files |
- html_output = wcs_sandbox_html_output |
- exclude_js = [] |
- instrument_js = [] |
- } |
- |
- background_html = target_name + "_background_html" |
- background_html_output = |
- "$target_gen_dir/html/$target_name/ar_background.html" |
- |
- build_webapp_html(background_html) { |
- html_template_file = ar_background_template |
- html_template_include_files = [] |
- js_files = ar_background_html_js_files |
- html_output = background_html_output |
- exclude_js = [] |
- instrument_js = [] |
- } |
- |
- main_html = target_name + "_main_html" |
- main_html_output = "$target_gen_dir/html/$target_name/main.html" |
- |
- build_webapp_html(main_html) { |
- html_template_file = ar_main_template |
- html_template_include_files = ar_main_template_files |
- js_files = ar_main_js_files |
- html_output = main_html_output |
- exclude_js = [] |
- instrument_js = [] |
- } |
- |
- action(target_name) { |
- script = "build-webapp.py" |
- |
- app_name = invoker.app_name |
- |
- ar_path = "app_remoting/$app_name" |
- ar_manifest = "$ar_path/manifest.json" |
- |
- output_dir = "$root_build_dir/remoting/app_remoting/$target_name" |
- zip_path = "$root_build_dir/remoting/app_remoting/$target_name.zip" |
- |
- ar_generated_html_files = [ |
- background_html_output, |
- feedback_consent_html_output, |
- loading_window_html_output, |
- message_window_html_output, |
- wcs_sandbox_html_output, |
- main_html_output, |
- "$target_gen_dir/credits.html", |
- ] |
- |
- ar_webapp_files = |
- ar_shared_resource_files + ar_all_js_files + ar_generated_html_files |
- |
- inputs = [ rebase_path(ar_manifest, root_build_dir) ] + |
- remoting_version_files + ar_webapp_files |
- |
- outputs = [ |
- zip_path, |
- ] |
- |
- deps = [ |
- ":$background_html", |
- ":$feedback_consent_html", |
- ":$loading_window_html", |
- ":$locales_listfile", |
- ":$main_html", |
- ":$message_window_html", |
- ":$wcs_sandbox_html", |
- "//remoting/resources", |
- "//remoting/webapp:credits", |
- ] |
- |
- # Create a file that contains a list of all the resource files needed |
- # to build the webapp. This is needed to avoid problems on platforms that |
- # limit the size of a command line. |
- file_list = "$target_gen_dir/${target_name}_files.txt" |
- files = [] |
- files += rebase_path(ar_webapp_files, root_build_dir) |
- write_file(file_list, files) |
- |
- args = [ |
- buildtype, |
- chrome_version_full, |
- rebase_path(output_dir, root_build_dir), |
- rebase_path(zip_path, root_build_dir), |
- rebase_path(ar_manifest, root_build_dir), |
- "shared_module", # Web app type |
- ] |
- args += [ |
- "--files_listfile", |
- rebase_path(file_list, root_build_dir), |
- ] |
- args += [ |
- "--locales_listfile", |
- rebase_path(locales_listfile_output, root_build_dir), |
- ] |
- } |
-} |