From 8d65a3c1ef8b89316db9c73efff3758403a0442d Mon Sep 17 00:00:00 2001 From: machenbach Date: Thu, 30 Jun 2016 00:50:21 -0700 Subject: [PATCH] Revert of [gn] Fix valgrind config (patchset #1 id:1 of https://codereview.chromium.org/2109403002/ ) Reason for revert: Breaks... Original issue's description: > [gn] Fix valgrind config > > BUG=chromium:474921 > NOTRY=true > NOTREECHECKS=true > TBR=vogelheim@chromium.org, jochen@chromium.org > > Committed: https://crrev.com/e97c990a2b1fd0b5b90832a7f182daa25fee8291 > Cr-Commit-Position: refs/heads/master@{#37418} TBR=vogelheim@chromium.org,jochen@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:474921 Review-Url: https://codereview.chromium.org/2109423002 Cr-Commit-Position: refs/heads/master@{#37419} --- BUILD.gn | 4 ---- gni/isolate.gni | 7 +------ infra/mb/mb_config.pyl | 3 ++- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 5f7f66c765d5..466fac63cce2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -44,10 +44,6 @@ declare_args() { # Enable slow dchecks. v8_enable_slow_dchecks = false - # Indicate if valgrind was fetched as a custom deps to make it available on - # swarming. - v8_has_valgrind = false - # Interpreted regexp engine exists as platform-independent alternative # based where the regular expression is compiled to a bytecode. v8_interpreted_regexp = false diff --git a/gni/isolate.gni b/gni/isolate.gni index c2c025ce0c19..e6d166c46032 100644 --- a/gni/isolate.gni +++ b/gni/isolate.gni @@ -101,11 +101,6 @@ template("v8_isolate_run") { } else { use_snapshot = "false" } - if (v8_has_valgrind) { - has_valgrind = "1" - } else { - has_valgrind = "0" - } # Note, all paths will be rebased in isolate_driver.py to be relative to # the isolate file. @@ -137,7 +132,7 @@ template("v8_isolate_run") { "--config-variable", "gcmole=0", "--config-variable", - "has_valgrind=$has_valgrind", + "has_valgrind=0", "--config-variable", "icu_use_data_file_flag=$icu_use_data_file_flag", "--config-variable", diff --git a/infra/mb/mb_config.pyl b/infra/mb/mb_config.pyl index fa4da999f8ec..79d5b480c203 100644 --- a/infra/mb/mb_config.pyl +++ b/infra/mb/mb_config.pyl @@ -544,7 +544,8 @@ }, 'valgrind': { - 'gn_args': 'v8_has_valgrind=true', + # TODO(machenbach): Add this to gn. + 'gn_args': 'has_valgrind=true', 'gyp_defines': 'has_valgrind=1', },