chromium/src
0
Fork 0
Code Activity

Revert "Reapply "Move GN arg clang_unsafe_buffers_paths to BUILDCONFIG.gn.""

Browse Source 
This reverts commit 8d897a51bd.

Reason: still breaks downstream build.

Bug: 332580477
Change-Id: I097a76f8610797e070b596c66c849e4fb3450f3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5435896
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1284085}
This commit is contained in:
Tom Sepez
2024-04-08 20:46:45 +00:00
committed by Chromium LUCI CQ
parent c37d764373
commit 3b15523671
2 changed files with 10 additions and 10 deletions
build
config
BUILDCONFIG.gn
toolchain
rbe.gni

14
build/config/BUILDCONFIG.gn

@ -177,12 +177,6 @@ assert(!(is_debug && is_official_build), "Can't do official debug builds")
assert(!(current_os == "ios" && is_component_build),
"Can't use component build on iOS")
declare_args() {
# Unsafe buffers. Location of file used by plugins to track portions of
# the codebase which have been made manifestly safe.
clang_unsafe_buffers_paths = ""
}
# ==============================================================================
# TOOLCHAIN SETUP
# ==============================================================================
@ -553,8 +547,8 @@ foreach(_target_type,
}
}
}
if (_uses_cflags && clang_unsafe_buffers_paths != "") {
inputs += [ clang_unsafe_buffers_paths ]
if (_uses_cflags) {
inputs += [ "//build/config/unsafe_buffers_paths.txt" ]
}
}
}
@ -600,8 +594,8 @@ foreach(_target_type,
}
}
}
if (_uses_cflags && clang_unsafe_buffers_paths != "") {
inputs += [ clang_unsafe_buffers_paths ]
if (_uses_cflags) {
inputs += [ "//build/config/unsafe_buffers_paths.txt" ]
}
if (!defined(deps)) {

6
build/toolchain/rbe.gni

@ -22,6 +22,12 @@ declare_args() {
# The directory where the re-client configuration files are.
rbe_cfg_dir = "//buildtools/reclient_cfgs"
# TODO(danakj): This should live in //build/config/clang/clang.gni however the
# rbe.gni file is imported from BUILDCONFIG.gn, and we can't import gni stuff
# widely into there or we break stuff. Move this when the
# `rbe_bug_326584510_missing_inputs` var goes away.
clang_unsafe_buffers_paths = ""
}
declare_args() {