Revert "Include sanitize blacklist and other extra deps as part of scan-deps output" This test is failing on Windows bots, revert for now (will check the right fix and retry the patch).

[kousikk]

Summary

This reverts commit 962ca076e51c25a7a08f4e0d329c65328a635bdb.

[kousikk]

Failure - http://lab.llvm.org:8011/builders/clang-x64-windows-msvc/builds/11583

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

public:
 
   void finishedMainFile(DiagnosticsEngine &Diags) override {
     llvm::SmallString<256> CanonPath;
     for (const auto &File : getDependencies()) {
       CanonPath = File;
       llvm::sys::path::remove_dots(CanonPath, /*remove_dot_dot=*/true);
       C.handleFileDependency(*Opts, CanonPath);
     }
-    for (const auto& ExtraDep : Opts->ExtraDeps)
-      C.handleFileDependency(*Opts, ExtraDep);
   }
 
 private:
   std::unique_ptr<DependencyOutputOptions> Opts;
   DependencyConsumer &C;
 };
 
 /// A proxy file system that doesn't call `chdir` when changing the working

clang/test/ClangScanDeps/Inputs/non-header-dependency.json

-[
-    {
-      "directory": "DIR",
-      "command": "clang -E DIR/non-header-dependency_input.cpp -fsanitize=bounds -fsanitize-blacklist=DIR/Inputs/sanitize-blacklist.txt",
-      "file": "DIR/non-header-dependency_input.cpp"
-    }
-]

clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt

-fun:*

clang/test/ClangScanDeps/non-header-dependency.cpp

-// RUN: rm -rf %t.dir
-// RUN: rm -rf %t.cdb
-// RUN: mkdir -p %t.dir
-// RUN: cp %s %t.dir/non-header-dependency_input.cpp
-// RUN: mkdir %t.dir/Inputs
-// RUN: cp %S/Inputs/sanitize-blacklist.txt %t.dir/Inputs/sanitize-blacklist.txt
-// RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/non-header-dependency.json > %t.cdb
-//
-// RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s
-
-#define FOO "foo"
-
-// CHECK: Inputs{{/|\\}}sanitize-blacklist.txt
-// CHECK-NEXT: non-header-dependency_input.cpp