Skip to content

Commit 17e0bac

Browse files
committed
[gn] port b70be3d (clang/lib/DependencyScanning)
1 parent 39429dd commit 17e0bac

File tree

7 files changed

+24
-11
lines changed

7 files changed

+24
-11
lines changed

llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ static_library("clangd") {
4747
"//clang/lib/AST",
4848
"//clang/lib/ASTMatchers",
4949
"//clang/lib/Basic",
50+
"//clang/lib/DependencyScanning",
5051
"//clang/lib/Driver",
5152
"//clang/lib/Format",
5253
"//clang/lib/Frontend",
@@ -57,7 +58,6 @@ static_library("clangd") {
5758
"//clang/lib/Serialization",
5859
"//clang/lib/Tooling",
5960
"//clang/lib/Tooling/Core",
60-
"//clang/lib/Tooling/DependencyScanning",
6161
"//clang/lib/Tooling/Inclusions",
6262
"//clang/lib/Tooling/Inclusions/Stdlib",
6363
"//clang/lib/Tooling/Refactoring",

llvm/utils/gn/secondary/clang/lib/Tooling/DependencyScanning/BUILD.gn renamed to llvm/utils/gn/secondary/clang/lib/DependencyScanning/BUILD.gn

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ static_library("DependencyScanning") {
44
deps = [
55
"//clang/lib/AST",
66
"//clang/lib/Basic",
7-
"//clang/lib/CodeGen",
87
"//clang/lib/Driver",
98
"//clang/lib/Frontend",
10-
"//clang/lib/FrontendTool",
119
"//clang/lib/Lex",
12-
"//clang/lib/Parse",
13-
"//clang/lib/Serialization",
14-
"//clang/lib/Tooling",
1510
"//llvm/lib/IR",
11+
"//llvm/lib/Option",
1612
"//llvm/lib/Support",
1713
"//llvm/lib/Target:TargetsToBuild",
1814
"//llvm/lib/TargetParser",
@@ -21,7 +17,7 @@ static_library("DependencyScanning") {
2117
"DependencyScannerImpl.cpp",
2218
"DependencyScanningFilesystem.cpp",
2319
"DependencyScanningService.cpp",
24-
"DependencyScanningTool.cpp",
20+
"DependencyScanningUtils.cpp",
2521
"DependencyScanningWorker.cpp",
2622
"InProcessModuleCache.cpp",
2723
"ModuleDepCollector.cpp",

llvm/utils/gn/secondary/clang/lib/Tooling/BUILD.gn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ static_library("Tooling") {
66
"//clang/lib/AST",
77
"//clang/lib/ASTMatchers",
88
"//clang/lib/Basic",
9+
"//clang/lib/DependencyScanning",
910
"//clang/lib/Driver",
1011
"//clang/lib/Format",
1112
"//clang/lib/Frontend",
@@ -20,6 +21,7 @@ static_library("Tooling") {
2021
"ArgumentsAdjusters.cpp",
2122
"CommonOptionsParser.cpp",
2223
"CompilationDatabase.cpp",
24+
"DependencyScanningTool.cpp",
2325
"Execution.cpp",
2426
"ExpandResponseFilesCompilationDatabase.cpp",
2527
"FileMatchTrie.cpp",

llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ driver_executable("clang-scan-deps") {
1313
"//clang/lib/AST",
1414
"//clang/lib/Basic",
1515
"//clang/lib/CodeGen",
16+
"//clang/lib/DependencyScanning",
1617
"//clang/lib/Driver",
1718
"//clang/lib/Frontend",
1819
"//clang/lib/FrontendTool",
1920
"//clang/lib/Lex",
2021
"//clang/lib/Parse",
2122
"//clang/lib/Serialization",
2223
"//clang/lib/Tooling",
23-
"//clang/lib/Tooling/DependencyScanning",
2424
"//llvm/lib/IR",
2525
"//llvm/lib/Support",
2626
]

llvm/utils/gn/secondary/clang/unittests/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ group("unittests") {
99
"Basic:BasicTests",
1010
"CodeGen:ClangCodeGenTests",
1111
"CrossTU:CrossTUTests",
12+
"DependencyScanning:ClangDependencyScanningTests",
1213
"Driver:ClangDriverTests",
1314
"Format:FormatTests",
1415
"Frontend:FrontendTests",
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import("//third-party/unittest/unittest.gni")
2+
3+
unittest("ClangDependencyScanningTests") {
4+
configs += [ "//llvm/utils/gn/build:clang_code" ]
5+
deps = [
6+
"//clang/lib/DependencyScanning",
7+
"//clang/lib/Frontend",
8+
"//llvm/lib/Option",
9+
"//llvm/lib/Support",
10+
]
11+
sources = [
12+
"DependencyScanningFilesystemTest.cpp",
13+
"DependencyScanningWorkerTest.cpp",
14+
]
15+
}

llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ unittest("ToolingTests") {
77
"//clang/lib/AST",
88
"//clang/lib/ASTMatchers",
99
"//clang/lib/Basic",
10+
"//clang/lib/DependencyScanning",
1011
"//clang/lib/Format",
1112
"//clang/lib/Frontend",
1213
"//clang/lib/Lex",
1314
"//clang/lib/Rewrite",
1415
"//clang/lib/Testing",
1516
"//clang/lib/Tooling",
1617
"//clang/lib/Tooling/Core",
17-
"//clang/lib/Tooling/DependencyScanning",
1818
"//clang/lib/Tooling/Inclusions",
1919
"//clang/lib/Tooling/Inclusions/Stdlib",
2020
"//clang/lib/Tooling/Refactoring",
@@ -30,8 +30,7 @@ unittest("ToolingTests") {
3030
"CastExprTest.cpp",
3131
"CommentHandlerTest.cpp",
3232
"CompilationDatabaseTest.cpp",
33-
"DependencyScanning/DependencyScannerTest.cpp",
34-
"DependencyScanning/DependencyScanningFilesystemTest.cpp",
33+
"DependencyScannerTest.cpp",
3534
"DiagnosticsYamlTest.cpp",
3635
"ExecutionTest.cpp",
3736
"FixItTest.cpp",

0 commit comments

Comments
 (0)