diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-01 21:20:32 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-01 21:20:32 +0000 |
| commit | 753a1b1e2158c6c4ab6ce0f65f5b7e9208e3c73b (patch) | |
| tree | 250fd65af314366dcce94d856f74cda639eb094c /components/nacl.gyp | |
| parent | 3c254b86ec4c6ad714f7c2cb3eec768765b0098d (diff) | |
| download | chromium_src-753a1b1e2158c6c4ab6ce0f65f5b7e9208e3c73b.zip chromium_src-753a1b1e2158c6c4ab6ce0f65f5b7e9208e3c73b.tar.gz chromium_src-753a1b1e2158c6c4ab6ce0f65f5b7e9208e3c73b.tar.bz2 | |
Revert "Pepper: Remove trusted plugin loadable module."
The reverted change broke the ChromeOS builder, which depends on the loadable
module file existing. Argh.
This reverts commit b0b91c06bc2ed6afc0611f00d68f72b19dd06d26.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/nacl.gyp')
| -rw-r--r-- | components/nacl.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/nacl.gyp b/components/nacl.gyp index 2620b11..a9933ca 100644 --- a/components/nacl.gyp +++ b/components/nacl.gyp @@ -78,6 +78,7 @@ '../base/base.gyp:base', '../base/base.gyp:base_static', '../ipc/ipc.gyp:ipc', + '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome', '../ppapi/ppapi_internal.gyp:ppapi_shared', '../ppapi/ppapi_internal.gyp:ppapi_ipc', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome', @@ -182,7 +183,6 @@ ], 'dependencies': [ '../content/content.gyp:content_renderer', - '../ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_trusted_plugin', '../third_party/jsoncpp/jsoncpp.gyp:jsoncpp', '../third_party/WebKit/public/blink.gyp:blink', ], |