From 10a9c3304b34037c531051c33c610e29d557c6ac Mon Sep 17 00:00:00 2001
From: Dennis Kempin <denniskempin@google.com>
Date: Thu, 27 Oct 2022 22:18:08 +0000
Subject: [PATCH] Simplify cargo-doc

We no longer need to selectively disable features or set the
CARGO_DOC env var to successfully build crosvm.

BUG=None
TEST=None

Change-Id: Ib997533c79340e3330a80633c4e8a81cbfb22ab6
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3988653
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
---
 tools/cargo-doc | 46 +++++++---------------------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

diff --git a/tools/cargo-doc b/tools/cargo-doc
index 04ebe9ff6f..cfafa39a04 100755
--- a/tools/cargo-doc
+++ b/tools/cargo-doc
@@ -8,42 +8,10 @@ set -ex
 # Build cargo-doc
 # $ ./tools/cargo-doc --target-dir /path/to/dir
 
-echo "start cargo-doc"
-
-MANIFEST_PATH=$(dirname "$0")/../Cargo.toml
-
-echo "manifest = ${MANIFEST_PATH}"
-
-DISABLED_FEATURES=(
-    audio_cras
-    chromeos
-    crash-report
-    libvda
-    video-decoder
-    video-encoder
-)
-
-ALL_FEATURES=$(
-    cargo metadata --manifest-path "${MANIFEST_PATH}" | \
-    jq -r '.packages[] |
-        select(.name == "crosvm") |
-        .features |
-        keys[]')
-
-features=""
-
-for f in $ALL_FEATURES; do
-    if [[ ! "${DISABLED_FEATURES[*]}" =~ $f ]]; then
-        features+=",${f}"
-    fi
-done
-
-# Set an environment variable 'CARGO_DOC' here so that each build.rs can skip
-# building unnecessary dependencies to generate documentations.
-CARGO_DOC="true" cargo doc \
-      --manifest-path="${MANIFEST_PATH}" \
-      --workspace \
-      --no-deps \
-      --exclude crosvm-fuzz \
-      --features="${features}" "$@" \
-      --document-private-items
+cargo doc \
+    --workspace \
+    --no-deps \
+    --exclude crosvm-fuzz \
+    --features="all-x86_64" \
+    --document-private-items \
+    "$@"