diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 19:53:20 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 19:53:20 +0000 |
| commit | 01167110d8b34bdefbe95cd1bc2f02205f43b991 (patch) | |
| tree | bb5e9a22ab76c4b067e2adfcec06ced5a249c4ad /chrome/chrome_common.gypi | |
| parent | 324b3a1c3b9925d4e85e3b288a77ea3e0e946eb0 (diff) | |
| download | chromium_src-01167110d8b34bdefbe95cd1bc2f02205f43b991.zip chromium_src-01167110d8b34bdefbe95cd1bc2f02205f43b991.tar.gz chromium_src-01167110d8b34bdefbe95cd1bc2f02205f43b991.tar.bz2 | |
Pepper: Remove trusted plugin loadable module.
This change links the trusted plugin into the renderer, making it easier for
the trusted plugin to use libraries in Chromium. This removes the
ppGoogleNaClPlugin loadable module file on various platforms.
This is part of a larger effort to remove the "trusted plugin" used to
bootstrap NaCl plugins.
It introduces an "internal_module" interface for setting the value returned by
pp::Module::Get(). This is so that both the trusted plugin and the remoting
plugin can be linked into the renderer. However, I believe this is safe because
the trusted plugin runs in-process and the remoting plugin runs out-of-process.
BUG=394497
R=dmichael@chromium.org, mseaborn@chromium.org, phajdan.jr@chromium.org, thestig@chromium.org, wez@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287071
Review URL: https://codereview.chromium.org/397243004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 3b2279e..ddbb2c1 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -418,6 +418,7 @@ ['disable_nacl==0', { 'dependencies': [ '<(DEPTH)/components/nacl.gyp:nacl_common', + '<(DEPTH)/ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_trusted_plugin', ], 'sources': [ 'common/extensions/manifest_handlers/nacl_modules_handler.cc', |