gn build: Follow-up to r364491 "[GN] Update build files"

- Merge r364427 (GSYM lib) more: It was missing the new unit test
  (as pointed out by llvm/utils/gn/build/sync_source_lists_from_cmake.py),
  and it had some superfluous deps not present in the cmake build.

- Merge r364474 (clang DependencyScanning lib) more: The deps didn't
  quite match cmake.

llvm-svn: 364501

5 files changed, 19 insertions, 4 deletions

diff --git a/llvm/utils/gn/secondary/clang/lib/Tooling/DependencyScanning/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Tooling/DependencyScanning/BUILD.gn
index 8f983fcbaed..572d0d66eee 100644
--- a/llvm/utils/gn/secondary/clang/lib/Tooling/DependencyScanning/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Tooling/DependencyScanning/BUILD.gn
@@ -11,6 +11,7 @@ static_library("DependencyScanning") {
     "//clang/lib/Parse",
     "//clang/lib/Serialization",
     "//clang/lib/Tooling",
+    "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
   sources = [
diff --git a/llvm/utils/gn/secondary/llvm/lib/DebugInfo/GSYM/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DebugInfo/GSYM/BUILD.gn
index d79c0a7a30e..48b70bd422e 100644
--- a/llvm/utils/gn/secondary/llvm/lib/DebugInfo/GSYM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/DebugInfo/GSYM/BUILD.gn
@@ -1,9 +1,6 @@
 static_library("GSYM") {
   output_name = "LLVMDebugInfoGSYM"
   deps = [
-    "//llvm/lib/BinaryFormat",
-    "//llvm/lib/MC",
-    "//llvm/lib/Object",
     "//llvm/lib/Support",
   ]
   sources = [
diff --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index 961b7c534d4..7c6a31636ad 100644
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -191,7 +191,6 @@ group("test") {
     # dependencies to make sure the libaries exist on disk when llvm-config's
     # lit tests run.
     "//llvm/lib/LineEditor",
-    "//llvm/lib/DebugInfo/GSYM",
     "//llvm/lib/Testing/Support",
     "//llvm/tools/bugpoint",
     "//llvm/tools/dsymutil",
diff --git a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
index 0fd52e5e776..ca38e56a14c 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -11,6 +11,7 @@ group("unittests") {
     "CodeGen/GlobalISel:GlobalISelTests",
     "DebugInfo/CodeView:DebugInfoCodeViewTests",
     "DebugInfo/DWARF:DebugInfoDWARFTests",
+    "DebugInfo/GSYM:DebugInfoGSYMTests",
     "DebugInfo/MSF:DebugInfoMSFTests",
     "DebugInfo/PDB:DebugInfoPDBTests",
     "Demangle:DemangleTests",
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
new file mode 100644
index 00000000000..a5e13a41342
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
@@ -0,0 +1,17 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("DebugInfoGSYMTests") {
+  deps = [
+    "//llvm/lib/CodeGen/AsmPrinter",
+    "//llvm/lib/DebugInfo/GSYM",
+    "//llvm/lib/MC",
+    "//llvm/lib/Object",
+    "//llvm/lib/ObjectYAML",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:TargetsToBuild",
+    "//llvm/lib/Testing/Support",
+  ]
+  sources = [
+    "GSYMTest.cpp",
+  ]
+}