diff options
Diffstat (limited to 'www/chromium/files/patch-base_BUILD.gn')
-rw-r--r-- | www/chromium/files/patch-base_BUILD.gn | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 8b460ebbffe1..e92a9d180ccb 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2025-07-02 06:08:04 UTC +--- base/BUILD.gn.orig 2025-08-07 06:57:29 UTC +++ base/BUILD.gn -@@ -1107,11 +1107,26 @@ component("base") { +@@ -1102,11 +1102,26 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -28,7 +28,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1131,7 +1146,7 @@ component("base") { +@@ -1126,7 +1141,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -37,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2172,6 +2187,22 @@ component("base") { +@@ -2137,6 +2152,22 @@ component("base") { ] } @@ -60,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2340,6 +2371,33 @@ component("base") { +@@ -2305,6 +2336,33 @@ component("base") { } } @@ -94,7 +94,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2735,7 +2793,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2694,7 +2752,7 @@ buildflag_header("protected_memory_buildflags") { header = "protected_memory_buildflags.h" header_dir = "base/memory" @@ -103,16 +103,16 @@ (is_win || is_linux || is_android || is_mac) flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] -@@ -3242,7 +3300,7 @@ if (is_apple) { +@@ -3200,7 +3258,7 @@ if (is_apple) { } } --if (!is_nacl && (is_linux || is_chromeos)) { -+if (!is_nacl && !is_bsd && (is_linux || is_chromeos)) { +-if (is_linux || is_chromeos) { ++if (!is_bsd && (is_linux || is_chromeos)) { # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3931,7 +3989,7 @@ test("base_unittests") { +@@ -3885,7 +3943,7 @@ test("base_unittests") { ] } @@ -121,16 +121,16 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3959,7 +4017,7 @@ test("base_unittests") { +@@ -3909,7 +3967,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] -- if (!is_nacl && !is_apple) { -+ if (!is_nacl && !is_apple && !is_bsd) { +- if (!is_apple) { ++ if (!is_apple && !is_bsd) { sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3970,7 +4028,7 @@ test("base_unittests") { +@@ -3920,7 +3978,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -139,7 +139,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4158,7 +4216,7 @@ test("base_unittests") { +@@ -4108,7 +4166,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } |