--- third_party/partition_alloc/partition_alloc.gni.orig 2026-09-01 03:39:43 UTC +++ third_party/partition_alloc/partition_alloc.gni @@ -110,8 +110,8 @@ use_large_empty_slot_span_ring = true # TODO(crbug.com/329199197): Clean this up when experiments are complete. use_large_empty_slot_span_ring = true -has_memory_tagging = current_cpu == "arm64" && is_clang && !is_asan && - !is_hwasan && (is_linux || is_android) +has_memory_tagging = current_cpu == "arm64" && !is_bsd && is_clang && + !is_asan && !is_hwasan && (is_linux || is_android) declare_args() { # Whether PartitionAlloc is built in official mode. @@ -540,7 +540,8 @@ is_pkeys_available = # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. is_pkeys_available = - (is_linux || is_chromeos) && current_cpu == "x64" && !is_cronet_build + (is_linux || is_chromeos) && !is_bsd && current_cpu == "x64" && + !is_cronet_build declare_args() { enable_pkeys = is_pkeys_available }