gn build: Merge r355777

llvm-svn: 355857

llvm/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",

llvm/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",

llvm/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) {

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

@@ -12,7 +12,6 @@ unittest("BasicTests") {
     "DiagnosticTest.cpp",
     "FileManagerTest.cpp",
     "FixedPointTest.cpp",
-    "MemoryBufferCacheTest.cpp",
     "SourceManagerTest.cpp",
   ]
 }

llvm/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",
+  ]
+}