Skip to content

Commit

Permalink
lacros: Disable stack protector
Browse files Browse the repository at this point in the history
Temporarily disables stack protector which causes a crash on launch
while the issue is further investigation.

(cherry picked from commit c1c1fc7)

Bug: 1316129
Change-Id: Idd2a884553c78020179e1f6df46e2524338fe221
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3597034
Reviewed-by: Jenny Zhang <jennyz@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#994273}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3597089
Commit-Queue: Srinivas Sista <srinivassista@chromium.org>
Auto-Submit: Srinivas Sista <srinivassista@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#60}
Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
  • Loading branch information
erikchen authored and Chromium LUCI CQ committed Apr 20, 2022
1 parent b14e39b commit 0f7bdf0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion chrome/browser/chrome_content_browser_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2513,7 +2513,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);

#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
// TODO(https://crbug.com/1316129): Re-enable for Lacros.
// Processes may only query perf_event_open with the BPF sandbox disabled.
if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) {
Expand Down

0 comments on commit 0f7bdf0

Please sign in to comment.