Index: remoting/webapp/build-webapp.py |
diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py |
index da7e516b37d10bc1784b20550f35d64d6f47eaf1..f4fb06f4ec66dcd86dcd4f2c9c29098aacd927d4 100755 |
--- a/remoting/webapp/build-webapp.py |
+++ b/remoting/webapp/build-webapp.py |
@@ -121,7 +121,7 @@ def buildWebApp(buildtype, version, destination, zip_path, |
contents of |destination|. |
manifest_template: jinja2 template file for manifest. |
webapp_type: webapp type: |
- For DesktopRemoting: "v1", "v2" or "v2_pnacl" |
+ For DesktopRemoting: "desktop" |
For AppRemoting: "app_remoting" or "shared_module" |
appid: A string with the Remoting Application Id (only used for app |
remoting webapps). If supplied, it defaults to using the |
@@ -222,13 +222,6 @@ def buildWebApp(buildtype, version, destination, zip_path, |
service_environment == 'prod-testing' |
is_desktop_remoting = not is_app_remoting |
kelvinp
2015/08/03 20:27:12
This file is out-of-date.
There is a getClientPlu
Sergey Ulanov
2015/08/03 20:40:34
Removed getClientPluginType() now
|
- # Set client plugin type. |
- # TODO(wez): Use 'native' in app_remoting until b/17441659 is resolved. |
- if not is_app_remoting_webapp: |
- client_plugin = 'pnacl' if webapp_type == 'v2_pnacl' else 'native' |
- findAndReplace(os.path.join(destination, 'plugin_settings.js'), |
- "'CLIENT_PLUGIN_TYPE'", "'" + client_plugin + "'") |
- |
# Allow host names for google services/apis to be overriden via env vars. |
oauth2AccountsHost = os.environ.get( |
'OAUTH2_ACCOUNTS_HOST', 'https://accounts.google.com') |