diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn index 2fe0f4ea87f2f..14a2ec9ff325c 100644 --- a/build/config/gcc/BUILD.gn +++ b/build/config/gcc/BUILD.gn @@ -98,10 +98,6 @@ config("rpath_for_built_shared_libraries") { # Settings for executables. config("executable_ldconfig") { - # WARNING! //sandbox/linux:chrome_sandbox will not pick up this - # config, because it is a setuid binary that needs special flags. - # If you add things to this config, make sure you check to see - # if they should be added to that target as well. ldflags = [] if (is_android) { ldflags += [ diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn index 6f43c6cb60b7c..754fe5a50b322 100644 --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn @@ -319,25 +319,6 @@ if (is_linux) { # TODO fix this and re-enable this warning. "-Wno-sign-compare", ] - - import("//build/config/compiler/compiler.gni") - import("//build/config/sanitizers/sanitizers.gni") - if (is_component_build || using_sanitizer) { - # WARNING! We remove this config so that we don't accidentally - # pick up the //build/config:rpath_for_built_shared_libraries - # sub-config. However, this means that we need to duplicate any - # other flags that executable_config might have. - configs -= [ "//build/config:executable_config" ] - if (!use_gold) { - ldflags = [ "-Wl,--disable-new-dtags" ] - } - } - - # We also do not want to pick up any of the other sanitizer - # flags (i.e. we do not want to build w/ the sanitizers at all). - # This is safe to delete unconditionally, because it is part of the - # default configs and empty when not using the sanitizers. - configs -= [ "//build/config/sanitizers:default_sanitizer_flags" ] } }