summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Liu <ioeric@google.com>2018-05-30 11:52:01 +0000
committerEric Liu <ioeric@google.com>2018-05-30 11:52:01 +0000
commit46fdee75e70291e9c2eb00e07f997d05c5b4563d (patch)
treeb0c1a0fd6d9d703f1bb29ef1920cdcbe8a90fba5
parent4f20e9de0a25296c73f879fe228496bad8b65051 (diff)
downloadbcm5719-llvm-46fdee75e70291e9c2eb00e07f997d05c5b4563d.tar.gz
bcm5719-llvm-46fdee75e70291e9c2eb00e07f997d05c5b4563d.zip
Reland "[clangd] Adapt file migration in r332720"
This reverts commit r332752 (i.e. reland r332721). llvm-svn: 333533
-rw-r--r--clang-tools-extra/clangd/CMakeLists.txt1
-rw-r--r--clang-tools-extra/clangd/Headers.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
index 1acf1c97110..6ff7fc555d6 100644
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -56,6 +56,7 @@ add_clang_library(clangDaemon
clangSerialization
clangTooling
clangToolingCore
+ clangToolingInclusions
clangToolingRefactor
${LLVM_PTHREAD_LIB}
${CLANGD_ATOMIC_LIB}
diff --git a/clang-tools-extra/clangd/Headers.h b/clang-tools-extra/clangd/Headers.h
index c227485ed87..987832fc92e 100644
--- a/clang-tools-extra/clangd/Headers.h
+++ b/clang-tools-extra/clangd/Headers.h
@@ -17,7 +17,7 @@
#include "clang/Format/Format.h"
#include "clang/Lex/HeaderSearch.h"
#include "clang/Lex/PPCallbacks.h"
-#include "clang/Tooling/Core/HeaderIncludes.h"
+#include "clang/Tooling/Inclusions/HeaderIncludes.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/Support/Error.h"
OpenPOWER on IntegriCloud