remoting/webapp/build-webapp.py - Issue 234023003: Build remoting for PNaCl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/webapp/build-webapp.py

Issue 234023003: Build remoting for PNaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: remoting/webapp/build-webapp.py

diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py

index 7f4a62c98b45f209919f1fdfa94c15f84d508421..01ffbe9fca65f0e4ba88169f11fd3e162376dd72 100755

--- a/remoting/webapp/build-webapp.py

+++ b/remoting/webapp/build-webapp.py

@@ -189,6 +189,11 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path,

findAndReplace(os.path.join(destination, 'plugin_settings.js'),

'HOST_PLUGIN_MIMETYPE', hostPluginMimeType)

+ # Set client plugin type.

+ 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')