diff options
| author | msb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 02:16:38 +0000 |
|---|---|---|
| committer | msb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 02:16:38 +0000 |
| commit | 0106cde9af0926fbc782929b460fb9ac0c4a13e8 (patch) | |
| tree | 6ef66780676cbd480afab52880a075a2e0ae9e07 /content/zygote | |
| parent | b1400059fd903a58285f861791295aeeb247ef7c (diff) | |
| download | chromium_src-0106cde9af0926fbc782929b460fb9ac0c4a13e8.zip chromium_src-0106cde9af0926fbc782929b460fb9ac0c4a13e8.tar.gz chromium_src-0106cde9af0926fbc782929b460fb9ac0c4a13e8.tar.bz2 | |
content_shell: fix linux ENABLE_PLUGIN=0 build
Fixes the following build errors:
../../../../../../../home/mandeep/chrome_root/src/content/zygote/zygote_main_linux.cc:280: error: undefined reference to 'content::PepperPluginRegistry::PreloadModules()'
obj/content/libcontent_app.a(obj/content/app/content_app.content_main_runner.o):content_main_runner.cc:function content::RunZygote(content::MainFunctionParams const&, content::ContentMainDelegate*)::kMainFunctions: error: undefined reference to 'content::PpapiPluginMain(content::MainFunctionParams const&)'
BUG=none
Review URL: https://chromiumcodereview.appspot.com/12316078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/zygote')
| -rw-r--r-- | content/zygote/zygote_main_linux.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 1035d63..4ef3eefc 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -275,9 +275,10 @@ static void PreSandboxInit() { // pre-sandbox init, but more likely this is just a build configuration error. #error Which SSL library are you using? #endif - +#if defined(ENABLE_PLUGINS) // Ensure access to the Pepper plugins before the sandbox is turned on. PepperPluginRegistry::PreloadModules(); +#endif } #if !defined(CHROMIUM_SELINUX) |