mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: FTBFS when building with enable_plugins = false (#44003)

Browse source 
* fix: do not build electron_plugin_info_host_impl.cc when plugins are disabled

it fails to build from source with this error:

../../content/public/browser/plugin_service.h:17:2: error: "Plugins should be enabled"
   17 | #error "Plugins should be enabled"

* fix: FTBFS in printing_utils.cc when ENABLE_PDF is false

* fixup! fix: do not build electron_plugin_info_host_impl.cc when plugins are disabled

fix BUILD.gn linting
This commit is contained in:
Charles Kerr 2024-09-29 17:10:34 -05:00 committed by GitHub
parent 27d2a8f9e2
commit eb40d2cbfa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BUILD.gn
View file

@ -674,6 +674,8 @@ source_set("electron_lib") {
if (enable_plugins) { if (enable_plugins) {
sources += [ sources += [
"shell/browser/electron_plugin_info_host_impl.cc",
"shell/browser/electron_plugin_info_host_impl.h",
"shell/common/plugin_info.cc", "shell/common/plugin_info.cc",
"shell/common/plugin_info.h", "shell/common/plugin_info.h",
] ]

2
filenames.gni
View file

@ -379,8 +379,6 @@ filenames = {
"shell/browser/electron_navigation_throttle.h", "shell/browser/electron_navigation_throttle.h",
"shell/browser/electron_permission_manager.cc", "shell/browser/electron_permission_manager.cc",
"shell/browser/electron_permission_manager.h", "shell/browser/electron_permission_manager.h",
"shell/browser/electron_plugin_info_host_impl.cc",
"shell/browser/electron_plugin_info_host_impl.h",
"shell/browser/electron_speech_recognition_manager_delegate.cc", "shell/browser/electron_speech_recognition_manager_delegate.cc",
"shell/browser/electron_speech_recognition_manager_delegate.h", "shell/browser/electron_speech_recognition_manager_delegate.h",
"shell/browser/electron_web_contents_utility_handler_impl.cc", "shell/browser/electron_web_contents_utility_handler_impl.cc",

2
shell/browser/electron_browser_client.cc
View file

@ -1458,6 +1458,7 @@ void ElectronBrowserClient::
render_frame_host); render_frame_host);
}, },
&render_frame_host)); &render_frame_host));
#if BUILDFLAG(ENABLE_PLUGINS)
associated_registry.AddInterface<mojom::ElectronPluginInfoHost>( associated_registry.AddInterface<mojom::ElectronPluginInfoHost>(
base::BindRepeating( base::BindRepeating(
[](content::RenderFrameHost* render_frame_host, [](content::RenderFrameHost* render_frame_host,
@ -1468,6 +1469,7 @@ void ElectronBrowserClient::
std::move(receiver)); std::move(receiver));
}, },
&render_frame_host)); &render_frame_host));
#endif
#if BUILDFLAG(ENABLE_PRINTING) #if BUILDFLAG(ENABLE_PRINTING)
associated_registry.AddInterface<printing::mojom::PrintManagerHost>( associated_registry.AddInterface<printing::mojom::PrintManagerHost>(
base::BindRepeating( base::BindRepeating(

5
shell/browser/printing/printing_utils.cc
View file

@ -15,11 +15,14 @@
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "electron/buildflags/buildflags.h" #include "electron/buildflags/buildflags.h"
#include "pdf/pdf_features.h"
#include "printing/backend/print_backend.h" // nogncheck #include "printing/backend/print_backend.h" // nogncheck
#include "printing/units.h" #include "printing/units.h"
#include "shell/common/thread_restrictions.h" #include "shell/common/thread_restrictions.h"
#if BUILDFLAG(ENABLE_PDF_VIEWER)
#include "pdf/pdf_features.h"
#endif
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS) #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
#endif #endif