diff options
| author | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-08 19:59:19 +0000 |
|---|---|---|
| committer | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-08 19:59:19 +0000 |
| commit | ea54aa743e594b99049acb8dbb639d0c168624fe (patch) | |
| tree | e98d35e43ab376a1fedff31960fe7123c0228f37 /ppapi/native_client/chrome_main.scons | |
| parent | b7083416e7e05fb72e86f701b8407d6b4c67bff4 (diff) | |
| download | chromium_src-ea54aa743e594b99049acb8dbb639d0c168624fe.zip chromium_src-ea54aa743e594b99049acb8dbb639d0c168624fe.tar.gz chromium_src-ea54aa743e594b99049acb8dbb639d0c168624fe.tar.bz2 | |
Make --enable-pnacl flag use the built-in PNaCl instead of the component updater
This makes it open files from the product_dir/pnacl instead of from
wherever the component updater would have lazily installed files.
Also make it not use the webstore extension.
Clamp down a bit harder on requiring the --enable-pnacl
flag, now that usage is not gated on having installed an extension.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2365
R=sehr@google.com
TEST= manual:
(1) run out/Debug/chrome --enable-pnacl --enable-nacl --user-data-dir=/tmp/temp_user_data
(2) surf to a pnacl webpage
(This is a clone of jvoung's CL https://codereview.chromium.org/11411233/
because he's on vacation right now)
Review URL: https://chromiumcodereview.appspot.com/11443014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client/chrome_main.scons')
| -rw-r--r-- | ppapi/native_client/chrome_main.scons | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons index 24214ea..438b914 100644 --- a/ppapi/native_client/chrome_main.scons +++ b/ppapi/native_client/chrome_main.scons @@ -527,13 +527,9 @@ def PPAPIBrowserTester(env, for extension in extensions: command.extend(['--extension', extension]) if env.Bit('bitcode'): - # TODO(jvoung): remove this --extension once we have --pnacl-dir working. - command.extend(['--extension', env.GetPnaclExtensionNode().abspath]) # Enable the installed version of pnacl, and point to a custom install # directory for testing purposes. browser_flags.append('--enable-pnacl') - browser_flags.append('--pnacl-dir=%s' % - env.GetPnaclExtensionRootNode().abspath) for dest_path, dep_file in map_files: command.extend(['--map_file', dest_path, dep_file]) for file_ext, mime_type in mime_types: |