From 353b6fb1388d4202f00afd91ef526ecafc963b96 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 16 May 2025 12:35:21 -0400 Subject: [PATCH] build: Remove GN arg is_cef_sandbox_build (see #3824) This argument is no longer used after removing cef_sandbox patches. --- BUILD.gn | 1 - libcef/features/BUILD.gn | 1 - libcef/features/features.gni | 7 ------- libcef_dll/sandbox/sandbox_win.cc | 17 ----------------- tools/gn_args.py | 4 ---- 5 files changed, 30 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index ebf2bad48..3ded3fdb4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1223,7 +1223,6 @@ if (is_win) { configs += [ ":libcef_includes_config" ] deps = [ ":make_config_header", - "libcef/features:buildflags", "//sandbox", ] } diff --git a/libcef/features/BUILD.gn b/libcef/features/BUILD.gn index 490c77189..4949de4d4 100644 --- a/libcef/features/BUILD.gn +++ b/libcef/features/BUILD.gn @@ -84,7 +84,6 @@ buildflag_header("buildflags") { flags = [ "ENABLE_CEF=$enable_cef", - "IS_CEF_SANDBOX_BUILD=$is_cef_sandbox_build", ] } diff --git a/libcef/features/features.gni b/libcef/features/features.gni index 3fc4e80a7..c03974511 100644 --- a/libcef/features/features.gni +++ b/libcef/features/features.gni @@ -5,13 +5,6 @@ declare_args() { enable_cef = true - # Enables base target customizations necessary for distribution of the - # cef_sandbox static library. This value will be set via gn_args.py for the - # official sandbox build configurations only. DO NOT SET THIS VALUE MANUALLY - # FOR OTHER CHROMIUM/CEF BUILD CONFIGURATIONS AS ITS USE MAY HAVE SIGNIFICANT - # PERFORMANCE AND/OR SECURITY IMPLICATIONS. - is_cef_sandbox_build = false - # Optionally configure the CEF API version. This impacts wrapper-side only. cef_api_version = "" } diff --git a/libcef_dll/sandbox/sandbox_win.cc b/libcef_dll/sandbox/sandbox_win.cc index cb026b293..8a9692c5d 100644 --- a/libcef_dll/sandbox/sandbox_win.cc +++ b/libcef_dll/sandbox/sandbox_win.cc @@ -5,7 +5,6 @@ #include "sandbox/win/src/sandbox.h" #include "base/notreached.h" -#include "cef/libcef/features/features.h" #include "include/cef_sandbox_win.h" #include "sandbox/win/src/sandbox_factory.h" @@ -39,19 +38,3 @@ void* cef_sandbox_info_create() { void cef_sandbox_info_destroy(void* sandbox_info) { delete static_cast(sandbox_info); } - -#if BUILDFLAG(IS_CEF_SANDBOX_BUILD) - -// Avoid bringing in partition_alloc dependencies. -namespace partition_alloc { -bool ReleaseReservation() { - DCHECK(false); - return false; -} - -void TerminateBecauseOutOfMemory(size_t size) { - DCHECK(false); -} -} // namespace partition_alloc - -#endif // BUILDFLAG(IS_CEF_SANDBOX_BUILD) diff --git a/tools/gn_args.py b/tools/gn_args.py index 9e5dd0ada..16a3e0f3e 100644 --- a/tools/gn_args.py +++ b/tools/gn_args.py @@ -544,10 +544,6 @@ def GetConfigArgsSandbox(platform, args, is_debug, cpu): # generally incompatible with default platform ld/link versions and # shouldn't be distributed due to the external .o file dependencies. 'use_thin_archives': False, - - # Enable base target customizations necessary for distribution of the - # cef_sandbox static library. - 'is_cef_sandbox_build': True, } if not is_debug: