ppapi/native_client/chrome_main.scons - Issue 22839005: disable pnacl by default

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: ppapi/native_client/chrome_main.scons

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove some unintended revert changes Created 7 years, 4 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: ppapi/native_client/chrome_main.scons

diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons

index 8f41ab027437685fd70fe41d192f98136a36fb5c..2a8f0ba3ca68c89b70c1f2da3c6053d8048e91cd 100644

--- a/ppapi/native_client/chrome_main.scons

+++ b/ppapi/native_client/chrome_main.scons

@@ -463,6 +463,10 @@ def PPAPIBrowserTester(env,

command.extend(['--file', dep_file])

for extension in extensions:

command.extend(['--extension', extension])

+ if env.Bit('bitcode'):

+ # Enable the installed version of pnacl, and point to a custom install

+ # directory for testing purposes.

+ browser_flags.append('--enable-pnacl')

for dest_path, dep_file in map_files:

command.extend(['--map_file', dest_path, dep_file])

for file_ext, mime_type in mime_types: