gn build: Merge r350852

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350904 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/gn/secondary/clang/test/BUILD.gn b/utils/gn/secondary/clang/test/BUILD.gn
index 1ac7ce1..0d805bd 100644
--- a/utils/gn/secondary/clang/test/BUILD.gn
+++ b/utils/gn/secondary/clang/test/BUILD.gn
@@ -156,7 +156,7 @@
   if (clang_enable_static_analyzer) {
     deps += [
       "//clang/tools/clang-check",
-      "//clang/tools/clang-func-mapping",
+      "//clang/tools/clang-extdef-mapping",
     ]
   }
 
diff --git a/utils/gn/secondary/clang/tools/clang-func-mapping/BUILD.gn b/utils/gn/secondary/clang/tools/clang-extdef-mapping/BUILD.gn
similarity index 82%
rename from utils/gn/secondary/clang/tools/clang-func-mapping/BUILD.gn
rename to utils/gn/secondary/clang/tools/clang-extdef-mapping/BUILD.gn
index cc61055..68b3af4 100644
--- a/utils/gn/secondary/clang/tools/clang-func-mapping/BUILD.gn
+++ b/utils/gn/secondary/clang/tools/clang-extdef-mapping/BUILD.gn
@@ -1,4 +1,4 @@
-executable("clang-func-mapping") {
+executable("clang-extdef-mapping") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
     "//clang/lib/AST",
@@ -12,6 +12,6 @@
     "//llvm/lib/Support",
   ]
   sources = [
-    "ClangFnMapGen.cpp",
+    "ClangExtDefMapGen.cpp",
   ]
 }