Merge up through LLVM r163557.
New CommentCommandInfo and CommentHTMLTagsProperties targets for TableGen.
Updated Android.mk source files for AST, StaticAnalyzer/Checkers,
StaticAnalyzer/Core, driver, and TableGen.
Split Rewrite/Android.mk into Core and Frontend sub-libraries.
Change-Id: Ia114939e242a79570c41a519f4f3cc712a0ed9a8
diff --git a/clang-tblgen-rules.mk b/clang-tblgen-rules.mk
index b68a846..1be7198 100644
--- a/clang-tblgen-rules.mk
+++ b/clang-tblgen-rules.mk
@@ -89,6 +89,24 @@
$(call transform-host-clang-td-to-out,clang-sa-checkers)
endif
+ifneq ($(findstring CommentCommandInfo.inc,$(TBLGEN_TABLES)),)
+LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/CommentCommandInfo.inc
+$(intermediates)/include/clang/AST/CommentCommandInfo.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/include/clang/AST/CommentCommandInfo.inc: \
+ $(CLANG_ROOT_PATH)/include/clang/AST/CommentCommands.td \
+ $(CLANG_TBLGEN)
+ $(call transform-host-clang-td-to-out,clang-comment-command-info)
+endif
+
+ifneq ($(findstring CommentHTMLTagsProperties.inc,$(TBLGEN_TABLES)),)
+LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/CommentHTMLTagsProperties.inc
+$(intermediates)/include/clang/AST/CommentHTMLTagsProperties.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/include/clang/AST/CommentHTMLTagsProperties.inc: \
+ $(CLANG_ROOT_PATH)/include/clang/AST/CommentHTMLTags.td \
+ $(CLANG_TBLGEN)
+ $(call transform-host-clang-td-to-out,clang-comment-html-tags-properties)
+endif
+
ifneq ($(findstring CommentNodes.inc,$(TBLGEN_TABLES)),)
LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/CommentNodes.inc
$(intermediates)/include/clang/AST/CommentNodes.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)