summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-12-09 07:27:27 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-09 15:32:25 +0000
commit1be865f6b9edf39aaeba57750b33abc305f8ae0e (patch)
tree7fcea67fad0db02e70dd4617b493f6a413bd6f92 /build/common.gypi
parentf8f64423ed965a85cda6d4855757ca0394746fec (diff)
downloadchromium_src-1be865f6b9edf39aaeba57750b33abc305f8ae0e.zip
chromium_src-1be865f6b9edf39aaeba57750b33abc305f8ae0e.tar.gz
chromium_src-1be865f6b9edf39aaeba57750b33abc305f8ae0e.tar.bz2
Revert of Enable Control Flow Integrity for the official Linux Chrome. (patchset #1 id:1 of https://codereview.chromium.org/1502233004/ )
Reason for revert: Broken at clang trunk (http://crbug.com/568121) Original issue's description: > Enable Control Flow Integrity for the official Linux Chrome. > > This CL turns on CFI, a security check: > https://sites.google.com/a/chromium.org/dev/developers/testing/control-flow-integrity > http://clang.llvm.org/docs/ControlFlowIntegrity.html > > This feature enables LTO (Link-Time Optimization) builds, which slow down the linker by 3x-4x. > CFI also comes with a code size overhead of about 7%-9%. The runtime CPU cost is less than 1%, > and should not be an issue. > > BUG=chromium:464797 > Intent to Implement thread: > https://groups.google.com/a/chromium.org/d/msg/chromium-dev/pbJqt6ccMII/7iJC2oklCAAJ > > This is a fourth attempt to land the CL. Previous attempts: > https://codereview.chromium.org/1502373003/ > https://codereview.chromium.org/1501593003/ > https://codereview.chromium.org/1393283005/ > > The last time it failed, it was https://crbug.com/567637 > (mismatched deps expectations for the installer). > Fixing the expectations. > > Committed: https://crrev.com/64719eadd90a3131a744baa89a1183bdcb1e2375 > Cr-Commit-Position: refs/heads/master@{#363895} TBR=thestig@chromium.org,krasin@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:464797 Review URL: https://codereview.chromium.org/1517443002 Cr-Commit-Position: refs/heads/master@{#364068}
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi7
1 files changed, 0 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi
index f591d98..565dd17 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -847,13 +847,6 @@
'enable_prod_wallet_service%': 1,
}],
- # Enable Control Flow Integrity for the official Linux Chrome.
- # This triggers an LTO build that requires LLVM Gold plugin to be
- # downloaded. See src/tools/clang/scripts/update.sh
- ['OS=="linux" and target_arch=="x64" and buildtype=="Official" and branding=="Chrome" and chromeos==0', {
- 'cfi_vptr%': 1,
- }],
-
# Enable hotwording on Chrome-branded ChromeOS builds.
['branding=="Chrome" and chromeos==1', {
'enable_hotwording%': 1,