Reland r361148 with a fix to the buildbot failure.

Reverted in r361377.
Also reland the '.gn' files (reverted in r361389).

llvm-svn: 361391

3 files changed, 34 insertions, 0 deletions

diff --git a/llvm/utils/gn/secondary/clang/lib/Tooling/Syntax/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Tooling/Syntax/BUILD.gn
new file mode 100644
index 00000000000..45c1f4388c2
--- /dev/null
+++ b/llvm/utils/gn/secondary/clang/lib/Tooling/Syntax/BUILD.gn
@@ -0,0 +1,13 @@
+static_library("Syntax") {
+  output_name = "clangToolingSyntax"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "Tokens.cpp",
+  ]
+}
diff --git a/llvm/utils/gn/secondary/clang/unittests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/BUILD.gn
index 047dcbd05c1..befe73b8d9d 100644
--- a/llvm/utils/gn/secondary/clang/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/BUILD.gn
@@ -17,6 +17,7 @@ group("unittests") {
     "Sema:SemaTests",
     "Serialization:SerializationTests",
     "Tooling:ToolingTests",
+    "Tooling/Syntax:SyntaxTests",
   ]
   if (clang_enable_static_analyzer) {
     deps += [
diff --git a/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
new file mode 100644
index 00000000000..d78cf5700b2
--- /dev/null
+++ b/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
@@ -0,0 +1,20 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("SyntaxTests") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//clang/lib/Tooling/Syntax",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:TargetsToBuild",
+    "//llvm/lib/Testing/Support",
+  ]
+  sources = [
+    "TokensTest.cpp",
+  ]
+}