bazel: win: Remove cef_sandbox.lib linking (see #3824)

Support for bootstrap executables will be added later.
This commit is contained in:
Marshall Greenblatt
2025-05-13 18:16:59 -04:00
parent 572c44bc2e
commit dadfe2c8dc
4 changed files with 4 additions and 38 deletions

View File

@ -47,7 +47,6 @@ def declare_exe(name, srcs, manifest_srcs, rc_file, resources_srcs, resources_de
srcs = srcs, srcs = srcs,
deps = [ deps = [
"@cef//:cef_wrapper", "@cef//:cef_wrapper",
"@cef//:cef_sandbox",
] + deps, ] + deps,
linkopts = [ linkopts = [
"$(location @cef//:cef_lib)", "$(location @cef//:cef_lib)",

View File

@ -81,6 +81,7 @@ DELAYLOAD_DLLS = [
# Standard link libraries. # Standard link libraries.
STANDARD_LIBS = [ STANDARD_LIBS = [
"comctl32.lib", "comctl32.lib",
"delayimp.lib",
"gdi32.lib", "gdi32.lib",
"rpcrt4.lib", "rpcrt4.lib",
"shlwapi.lib", "shlwapi.lib",
@ -88,26 +89,6 @@ STANDARD_LIBS = [
"ws2_32.lib", "ws2_32.lib",
] ]
# Sandbox link libraries.
SANDBOX_LIBS = [
"Advapi32.lib",
"dbghelp.lib",
"Delayimp.lib",
"ntdll.lib",
"OleAut32.lib",
"PowrProf.lib",
"Propsys.lib",
"psapi.lib",
"SetupAPI.lib",
"Shcore.lib",
"Shell32.lib",
"Userenv.lib",
"version.lib",
"wbemuuid.lib",
"WindowsApp.lib",
"winmm.lib",
]
COMMON_LINKOPTS_DEBUG = [ COMMON_LINKOPTS_DEBUG = [
] ]
@ -178,18 +159,9 @@ COMMON_DEFINES = [
"WIN32_LEAN_AND_MEAN", "WIN32_LEAN_AND_MEAN",
# Disable exceptions # Disable exceptions
"_HAS_EXCEPTIONS=0", "_HAS_EXCEPTIONS=0",
# Required by cef_sandbox.lib
"PSAPI_VERSION=1",
# Used by apps to test if the sandbox is enabled
"CEF_USE_SANDBOX",
] ]
COMMON_DEFINES_DEBUG = [ COMMON_DEFINES_DEBUG = [
# Required by cef_sandbox.lib
# Disable iterator debugging
"HAS_ITERATOR_DEBUGGING=0",
"_ITERATOR_DEBUG_LEVEL=0",
] ]
COMMON_DEFINES_RELEASE = [ COMMON_DEFINES_RELEASE = [

View File

@ -12,8 +12,7 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
load("//bazel:library_helpers.bzl", "declare_cc_library", "declare_objc_library") load("//bazel:library_helpers.bzl", "declare_cc_library", "declare_objc_library")
load("//bazel/win:variables.bzl", load("//bazel/win:variables.bzl",
WIN_DLLS="DLLS", WIN_DLLS="DLLS",
WIN_DLLS_X64="DLLS_X64", WIN_DLLS_X64="DLLS_X64")
WIN_SANDBOX_LIBS="SANDBOX_LIBS")
load("//bazel/linux:variables.bzl", load("//bazel/linux:variables.bzl",
LINUX_SOS="SOS") LINUX_SOS="SOS")
load("//bazel/mac:variables.bzl", load("//bazel/mac:variables.bzl",
@ -153,14 +152,11 @@ declare_cc_library(
}), }),
) )
# Only available on MacOS/Windows. # Only available on MacOS.
declare_cc_library( declare_cc_library(
name = "cef_sandbox_linkflags", name = "cef_sandbox_linkflags",
linkopts = select({ linkopts = select({
"@platforms//os:macos": ["-lsandbox"], "@platforms//os:macos": ["-lsandbox"],
"@platforms//os:windows": [
"/DEFAULTLIB:{}".format(lib) for lib in WIN_SANDBOX_LIBS
],
"//conditions:default": [], "//conditions:default": [],
}), }),
) )
@ -169,7 +165,6 @@ cc_import(
name = "cef_sandbox_debug", name = "cef_sandbox_debug",
static_library = select({ static_library = select({
"@platforms//os:macos": "Debug/cef_sandbox.a", "@platforms//os:macos": "Debug/cef_sandbox.a",
"@platforms//os:windows": "Debug/cef_sandbox.lib",
"//conditions:default": None, "//conditions:default": None,
}), }),
deps = [":cef_sandbox_linkflags"], deps = [":cef_sandbox_linkflags"],
@ -179,7 +174,6 @@ cc_import(
name = "cef_sandbox_release", name = "cef_sandbox_release",
static_library = select({ static_library = select({
"@platforms//os:macos": "Release/cef_sandbox.a", "@platforms//os:macos": "Release/cef_sandbox.a",
"@platforms//os:windows": "Release/cef_sandbox.lib",
"//conditions:default": None, "//conditions:default": None,
}), }),
deps = [":cef_sandbox_linkflags"], deps = [":cef_sandbox_linkflags"],

View File

@ -22,6 +22,7 @@ LINK_LIBS = [
"glu32.lib", "glu32.lib",
"imm32.lib", "imm32.lib",
"opengl32.lib", "opengl32.lib",
"shell32.lib",
] ]
DELAYLOAD_DLLS = [ DELAYLOAD_DLLS = [