From 89f0a34efff96dd223e0461b328983e72696b2d1 Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Thu, 20 Oct 2022 19:38:19 +0000 Subject: [PATCH] Disable scudo feature The feature will trigger rebuilds on every cargo build invocation. A fix is submitted: https://github.com/google/rust-scudo/pull/6 Until then, let's disable it. BUG=None TEST=health-check Change-Id: Id328bd976b65674b50f9845490eb5083008781e8 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3964927 Commit-Queue: Dennis Kempin Reviewed-by: Daniel Verkamp --- Cargo.toml | 2 +- tools/health-check | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 054019324a..18fbfb797c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -300,7 +300,7 @@ all-aarch64 = [ ] ## All features that are compiled and tested for x86_64 -all-x86_64 = ["all-aarch64", "plugin", "scudo"] +all-x86_64 = ["all-aarch64", "plugin"] ## All features that are compiled and tested for armhf ## Note: This platform is deprecated and will be phased out. diff --git a/tools/health-check b/tools/health-check index f372e4b1ba..0c9a67e520 100755 --- a/tools/health-check +++ b/tools/health-check @@ -113,6 +113,7 @@ KNOWN_DISABLED_FEATURES = [ "default-no-sandbox", "direct", "libvda", + "scudo", "whpx", ]