Automerge: [Bazel] Adjust to 97dee78

There is still one failing test, not sure yet how that can be fixed.

Author: akuegel

utils/bazel/llvm-project-overlay/clang-tools-extra/clang-doc/BUILD.bazel

@@ -16,13 +16,23 @@ cc_library(
     srcs = glob(["support/*.cpp"]),
     hdrs = glob(["support/*.h"]),
     deps = [
+        ":lib",
         "//llvm:Support",
     ],
 )
 
 cc_library(
     name = "lib",
-    srcs = glob(["*.cpp"]),
+    srcs = glob(
+        ["*.cpp"],
+        exclude = [
+            "Generators.cpp",
+            "HTMLGenerator.cpp",
+            "HTMLMustacheGenerator.cpp",
+            "MDGenerator.cpp",
+            "YAMLGenerator.cpp",
+        ],
+    ),
     hdrs = glob(["*.h"]),
     includes = ["."],
     deps = [
@@ -39,11 +49,36 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "generators",
+    srcs = [
+        "Generators.cpp",
+        "HTMLGenerator.cpp",
+        "HTMLMustacheGenerator.cpp",
+        "MDGenerator.cpp",
+        "YAMLGenerator.cpp",
+    ],
+    hdrs = ["Generators.h"],
+    includes = ["."],
+    deps = [
+        ":clang-doc-support",
+        ":lib",
+        "//clang:basic",
+        "//llvm:Support",
+    ],
+)
+
+filegroup(
+    name = "assets",
+    srcs = glob(["assets/**"]),
+)
+
 cc_binary(
     name = "clang-doc",
     srcs = ["tool/ClangDocMain.cpp"],
     stamp = 0,
     deps = [
+        ":generators",
         ":lib",
         "//clang:ast",
         "//clang:ast_matchers",

utils/bazel/llvm-project-overlay/clang-tools-extra/unittests/BUILD.bazel

@@ -64,10 +64,12 @@ cc_test(
         ],
         allow_empty = False,
     ),
+    data = ["//clang-tools-extra/clang-doc:assets"],
+    local_defines = ['CLANG_DOC_TEST_ASSET_DIR=\\"clang-tools-extra/clang-doc/assets\\"'],
     deps = [
         "//clang:ast",
         "//clang:basic",
-        "//clang-tools-extra/clang-doc:lib",
+        "//clang-tools-extra/clang-doc:generators",
         "//llvm:BitstreamReader",
         "//llvm:BitstreamWriter",
         "//llvm:Support",