gn build: Merge r355777

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355857 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/gn/secondary/clang/lib/Basic/BUILD.gn b/utils/gn/secondary/clang/lib/Basic/BUILD.gn
index 4d0578b0867ab9164fc01b47affa7542aaaa4d4d..dd7ae7723c449f58786ec8d73ceba647d67fc40a 100644 (file)
--- a/utils/gn/secondary/clang/lib/Basic/BUILD.gn
+++ b/utils/gn/secondary/clang/lib/Basic/BUILD.gn
@@ -34,7 +34,6 @@ static_library("Basic") {
     "FixedPoint.cpp",
     "IdentifierTable.cpp",
     "LangOptions.cpp",
-    "MemoryBufferCache.cpp",
     "Module.cpp",
     "ObjCRuntime.cpp",
     "OpenMPKinds.cpp",

diff --git a/utils/gn/secondary/clang/lib/Serialization/BUILD.gn b/utils/gn/secondary/clang/lib/Serialization/BUILD.gn
index 394b1edf2f8bdfb030297de3326925b7647f3644..8096e3a7cf7653d693b1625eb7116f92a0f72e56 100644 (file)
--- a/utils/gn/secondary/clang/lib/Serialization/BUILD.gn
+++ b/utils/gn/secondary/clang/lib/Serialization/BUILD.gn
@@ -23,6 +23,7 @@ static_library("Serialization") {
     "ASTWriterStmt.cpp",
     "GeneratePCH.cpp",
     "GlobalModuleIndex.cpp",
+    "InMemoryModuleCache.cpp",
     "Module.cpp",
     "ModuleFileExtension.cpp",
     "ModuleManager.cpp",

diff --git a/utils/gn/secondary/clang/unittests/BUILD.gn b/utils/gn/secondary/clang/unittests/BUILD.gn
index a8293ba926bbf9737543a657d8002cd8f1b972b6..047dcbd05c17606ddbeaf105dac03e3a08ba0ef9 100644 (file)
--- a/utils/gn/secondary/clang/unittests/BUILD.gn
+++ b/utils/gn/secondary/clang/unittests/BUILD.gn
@@ -15,6 +15,7 @@ group("unittests") {
     "Rename:ClangRenameTests",
     "Rewrite:RewriteTests",
     "Sema:SemaTests",
+    "Serialization:SerializationTests",
     "Tooling:ToolingTests",
   ]
   if (clang_enable_static_analyzer) {

diff --git a/utils/gn/secondary/clang/unittests/Basic/BUILD.gn b/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
index 31277aea8d2097facfc6e93d8a0317f8422344fd..2f4555d548c8816c34bb665370c012c73deff1f6 100644 (file)
--- a/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
+++ b/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
@@ -12,7 +12,6 @@ unittest("BasicTests") {
     "DiagnosticTest.cpp",
     "FileManagerTest.cpp",
     "FixedPointTest.cpp",
-    "MemoryBufferCacheTest.cpp",
     "SourceManagerTest.cpp",
   ]
 }

diff --git a/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn b/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
new file mode 100644 (file)
index 0000000..5c25382
--- /dev/null
+++ b/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
@@ -0,0 +1,17 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("SerializationTests") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Lex",
+    "//clang/lib/Sema",
+    "//clang/lib/Serialization",
+    "//llvm/lib/Bitcode/Reader",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "InMemoryModuleCacheTest.cpp",
+  ]
+}