bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Fix duplicate symbol ThrowBadVariantAccess with cef_sandbox build (fixes issue #3021)

This commit is contained in:
Cristian Amarie 2020-10-09 16:27:58 +00:00 committed by Marshall Greenblatt
parent 015e3621a3
commit 9e296bde3c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -1256,7 +1256,7 @@ if (is_win) {
sources = [ "libcef_dll/sandbox/sandbox_win.cc" ]
# CEF sources use include paths relative to the CEF root directory.
include_dirs = [ "." ]
deps = [ "//sandbox" ]
deps = [ "libcef/features", "//sandbox" ]
}
}

3
libcef_dll/sandbox/sandbox_win.cc
View File

@ -6,6 +6,7 @@
#include "sandbox/win/src/process_mitigations.h"
#include "sandbox/win/src/sandbox_factory.h"
#include "cef/libcef/features/features.h"
#include "include/cef_sandbox_win.h"
namespace {
@ -39,6 +40,7 @@ void cef_sandbox_info_destroy(void* sandbox_info) {
delete static_cast<sandbox::SandboxInterfaceInfo*>(sandbox_info);
}
#if BUILDFLAG(IS_CEF_SANDBOX_BUILD)
// Implementation from third_party/abseil-cpp/absl/types/bad_variant_access.cc
// to avoid bringing in absl dependencies.
namespace absl {
@ -48,3 +50,4 @@ void ThrowBadVariantAccess() {
}
} // namespace variant_internal
} // namespace absl
#endif // BUILDFLAG(IS_CEF_SANDBOX_BUILD)