Migrate external/clang to CLANG-155088-20120419.
Change-Id: I7e31d8b22ef405f54838a8582c78291fa45ca344
diff --git a/Android.mk b/Android.mk
index c75db3f..f8baec6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,6 @@
lib/Frontend \
lib/FrontendTool \
lib/Headers \
- lib/Index \
lib/Lex \
lib/Parse \
lib/Rewrite \
diff --git a/include/clang/Config/config.h b/include/clang/Config/config.h
index b37d42a..c5e6245 100644
--- a/include/clang/Config/config.h
+++ b/include/clang/Config/config.h
@@ -10,10 +10,13 @@
/* Relative directory for resource files */
#define CLANG_RESOURCE_DIR ""
-/* Directory where gcc is installed. */
-#define GCC_INSTALL_PREFIX ""
-
/* Directories clang will search for headers */
#define C_INCLUDE_DIRS ""
+/* Default <path> to all compiler invocations for --sysroot=<path>. */
+#define DEFAULT_SYSROOT ""
+
+/* Directory where gcc is installed. */
+#define GCC_INSTALL_PREFIX ""
+
#endif
diff --git a/lib/Index/Android.mk b/lib/Index/Android.mk
deleted file mode 100644
index a6a9746..0000000
--- a/lib/Index/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-# For the host only
-# =====================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-LOCAL_MODULE:= libclangIndex
-
-LOCAL_MODULE_TAGS := optional
-
-TBLGEN_TABLES := \
- AttrList.inc \
- Attrs.inc \
- DiagnosticCommonKinds.inc \
- DeclNodes.inc \
- StmtNodes.inc
-
-clang_index_SRC_FILES := \
- ASTLocation.cpp \
- Analyzer.cpp \
- DeclReferenceMap.cpp \
- Entity.cpp \
- GlobalCallGraph.cpp \
- GlobalSelector.cpp \
- Handlers.cpp \
- IndexProvider.cpp \
- Indexer.cpp \
- Program.cpp \
- SelectorMap.cpp
-
-LOCAL_SRC_FILES := $(clang_index_SRC_FILES)
-
-
-include $(CLANG_HOST_BUILD_MK)
-include $(CLANG_TBLGEN_RULES_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/Sema/Android.mk b/lib/Sema/Android.mk
index 4669f86..dadc4e8 100644
--- a/lib/Sema/Android.mk
+++ b/lib/Sema/Android.mk
@@ -53,6 +53,7 @@
SemaOverload.cpp \
SemaPseudoObject.cpp \
SemaStmt.cpp \
+ SemaStmtAttr.cpp \
SemaTemplate.cpp \
SemaTemplateDeduction.cpp \
SemaTemplateInstantiate.cpp \
diff --git a/lib/StaticAnalyzer/Checkers/Android.mk b/lib/StaticAnalyzer/Checkers/Android.mk
index 902a44b..b5e4d2c 100644
--- a/lib/StaticAnalyzer/Checkers/Android.mk
+++ b/lib/StaticAnalyzer/Checkers/Android.mk
@@ -31,6 +31,7 @@
CheckerDocumentation.cpp \
ChrootChecker.cpp \
ClangCheckers.cpp \
+ CommonBugCategories.cpp \
DeadStoresChecker.cpp \
DebugCheckers.cpp \
DereferenceChecker.cpp \
diff --git a/lib/StaticAnalyzer/Core/Android.mk b/lib/StaticAnalyzer/Core/Android.mk
index 9437340..51c8083 100644
--- a/lib/StaticAnalyzer/Core/Android.mk
+++ b/lib/StaticAnalyzer/Core/Android.mk
@@ -27,6 +27,7 @@
ExprEngineCXX.cpp \
ExprEngineCallAndReturn.cpp \
ExprEngineObjC.cpp \
+ FunctionSummary.cpp \
HTMLDiagnostics.cpp \
MemRegion.cpp \
ObjCMessage.cpp \
diff --git a/tools/driver/Android.mk b/tools/driver/Android.mk
index 05bc0e0..4750349 100644
--- a/tools/driver/Android.mk
+++ b/tools/driver/Android.mk
@@ -38,7 +38,6 @@
libclangStaticAnalyzerCheckers \
libclangStaticAnalyzerCore \
libclangAnalysis \
- libclangIndex \
libclangRewrite \
libclangEdit \
libclangAST \
