Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: build/config/sanitizers/sanitizers.gni

Issue 1532693002: Revert of Enable Control Flow Integrity for the official Linux Chrome. Try 6. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | chrome/installer/linux/debian/expected_deps_x64 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/sanitizers/sanitizers.gni
diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni
index 6d128134034c837ba90240133422a6f18565fbdc..f8f469c97c954f556fe298d36e9d6b13216ac39f 100644
--- a/build/config/sanitizers/sanitizers.gni
+++ b/build/config/sanitizers/sanitizers.gni
@@ -1,8 +1,6 @@
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-
-import("//build/config/chrome_build.gni")
declare_args() {
# Compile for Address Sanitizer to find memory bugs.
@@ -39,6 +37,10 @@
# https://code.google.com/p/sawbuck/wiki/SyzyASanHowTo
is_syzyasan = false
+ # Compile with Control Flow Integrity to protect virtual calls and casts.
+ # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
+ is_cfi = false
+
# By default, Control Flow Integrity will crash the program if it detects a
# violation. Set this to true to print detailed diagnostics instead.
use_cfi_diag = false
@@ -56,11 +58,6 @@
# declare_args block. User overrides are only applied at the end of a
# declare_args block.
declare_args() {
- # Compile with Control Flow Integrity to protect virtual calls and casts.
- # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
- is_cfi = is_linux && !is_chromeos && target_cpu == "x64" &&
- is_chrome_branded && is_official_build
-
# Use libc++ (buildtools/third_party/libc++ and
# buildtools/third_party/libc++abi) instead of stdlibc++ as standard library.
# This is intended to be used for instrumented builds.
« no previous file with comments | « build/common.gypi ('k') | chrome/installer/linux/debian/expected_deps_x64 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698