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

Unified Diff: build/standalone.gypi

Issue 1730543002: [coverage] Filter some files from instrumentation. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/coverage_wrapper.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 5269b95f64dbd9cf2f6ecba7c9c0d8764a4bf550..8ec841da498cd70a2691760f96fe9f568ae1dfd5 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -362,6 +362,23 @@
'host_cc': '<!(which gcc)',
'host_cxx': '<!(which g++)',
}],
+ ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
Michael Achenbach 2016/02/23 15:51:01 Unfortunately gyp doesn't support clever chaining
+ 'conditions': [
+ ['coverage==1', {
+ 'cc_wrapper': '<(base_dir)/build/coverage_wrapper.py <(gomadir)/gomacc',
+ }, {
+ 'cc_wrapper': '<(gomadir)/gomacc',
+ }],
+ ],
+ }, {
+ 'conditions': [
+ ['coverage==1', {
+ 'cc_wrapper': '<(base_dir)/build/coverage_wrapper.py',
+ }, {
+ 'cc_wrapper': 0,
+ }],
+ ],
+ }],
],
# Default ARM variable settings.
'arm_version%': 'default',
@@ -1261,12 +1278,12 @@
# TODO(yyanagisawa): supports GENERATOR==make
# make generator doesn't support CC_wrapper without CC
# in make_global_settings yet.
- ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
+ ['cc_wrapper!=0', {
'make_global_settings': [
- ['CC_wrapper', '<(gomadir)/gomacc'],
- ['CXX_wrapper', '<(gomadir)/gomacc'],
- ['CC.host_wrapper', '<(gomadir)/gomacc'],
- ['CXX.host_wrapper', '<(gomadir)/gomacc'],
+ ['CC_wrapper', '<(cc_wrapper)'],
+ ['CXX_wrapper', '<(cc_wrapper)'],
+ ['CC.host_wrapper', '<(cc_wrapper)'],
+ ['CXX.host_wrapper', '<(cc_wrapper)'],
],
}],
['use_lto==1', {
« no previous file with comments | « build/coverage_wrapper.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698