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

Side by Side Diff: build/common.gypi

Issue 1393283005: Enable Control Flow Integrity for the official Linux Chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix condition Created 5 years, 2 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 842
843 # Enable autofill dialog when not on iOS. 843 # Enable autofill dialog when not on iOS.
844 ['OS!="ios"', { 844 ['OS!="ios"', {
845 'enable_autofill_dialog%': 1, 845 'enable_autofill_dialog%': 1,
846 }], 846 }],
847 847
848 ['buildtype=="Official"', { 848 ['buildtype=="Official"', {
849 'enable_prod_wallet_service%': 1, 849 'enable_prod_wallet_service%': 1,
850 }], 850 }],
851 851
852 # Enable Control Flow Integrity for the official Linux Chrome.
Nico 2015/10/12 18:17:29 nit: Maybe add a comment that this condition shoul
853 ['OS=="linux" and buildtype=="Official" and branding=="Chrome"', {
Nico 2015/10/12 18:17:29 This will also enable this for chromeos. Is that i
854 'cfi_vptr%': 1,
855 }],
856
852 # Enable hotwording on Chrome-branded ChromeOS builds. 857 # Enable hotwording on Chrome-branded ChromeOS builds.
853 ['branding=="Chrome" and chromeos==1', { 858 ['branding=="Chrome" and chromeos==1', {
854 'enable_hotwording%': 1, 859 'enable_hotwording%': 1,
855 }], 860 }],
856 861
857 ['OS=="android"', { 862 ['OS=="android"', {
858 'enable_webrtc%': 1, 863 'enable_webrtc%': 1,
859 }], 864 }],
860 865
861 ['OS=="ios"', { 866 ['OS=="ios"', {
(...skipping 5435 matching lines...) Expand 10 before | Expand all | Expand 10 after
6297 # settings in target dicts. SYMROOT is a special case, because many other 6302 # settings in target dicts. SYMROOT is a special case, because many other
6298 # Xcode variables depend on it, including variables such as 6303 # Xcode variables depend on it, including variables such as
6299 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6304 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6300 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6305 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6301 # files to appear (when present) in the UI as actual files and not red 6306 # files to appear (when present) in the UI as actual files and not red
6302 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6307 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6303 # and therefore SYMROOT, needs to be set at the project level. 6308 # and therefore SYMROOT, needs to be set at the project level.
6304 'SYMROOT': '<(DEPTH)/xcodebuild', 6309 'SYMROOT': '<(DEPTH)/xcodebuild',
6305 }, 6310 },
6306 } 6311 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698