Update Clang for merge to r187914.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133

Fixups related to OptParser.td moving into LLVM (from Clang).

Add libLLVMOption dependency.

Android.mk changes:
- Arg.cpp
- ArgList.cpp
- Option.cpp
- OptTable.cpp
- OptParserEmitter.cpp
- LambdaMangleContext.cpp
+ ASTTypeTraits.cpp
+ MangleNumberingContext.cpp
+ MicrosoftVBTables.cpp

Change-Id: I0aef80d90be9297cd1d5b5a08134cb6de2af4d2e

7 files changed, 12 insertions, 13 deletions

diff --git a/README.android b/README.android
index 37d59b6cfe..80aea8fa1f 100644
--- a/README.android
+++ b/README.android
@@ -21,8 +21,9 @@
 * For Jellybean: Synced to upstream r155088
 * For Jellybean MR1: Synced to upstream r162325
 * For Jellybean MR2: Synced to upstream r177345
-* For Key Lime Pie: Synced to upstream r183849
+* For Key Lime Pie: Synced to upstream r187914
 
+* Recent downstreaming on 2013/8/8: Synced to r187914 (Contact srhines for merge questions.)
 * Recent downstreaming on 2013/6/13: Synced to r183849 (Contact srhines for merge questions.)
 * Recent downstreaming on 2013/5/3: Synced to r180944 (Contact srhines for merge questions.)
 * Recent downstreaming on 2013/3/18: Synced to r177345 (Contact srhines for merge questions.)
diff --git a/clang-tblgen-rules.mk b/clang-tblgen-rules.mk
index 26fc293630..6d202a896a 100644
--- a/clang-tblgen-rules.mk
+++ b/clang-tblgen-rules.mk
@@ -212,17 +212,17 @@ endif
 ifneq ($(findstring Options.inc,$(TBLGEN_TABLES)),)
 LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/Driver/Options.inc
 $(intermediates)/include/clang/Driver/Options.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
-$(intermediates)/include/clang/Driver/Options.inc: $(CLANG_ROOT_PATH)/include/clang/Driver/Options.td $(CLANG_ROOT_PATH)/include/clang/Driver/OptParser.td $(CLANG_ROOT_PATH)/include/clang/Driver/CC1Options.td \
-    | $(CLANG_TBLGEN)
-	$(call transform-host-clang-td-to-out,opt-parser-defs)
+$(intermediates)/include/clang/Driver/Options.inc: $(CLANG_ROOT_PATH)/include/clang/Driver/Options.td $(LLVM_ROOT_PATH)/include/llvm/Option/OptParser.td $(CLANG_ROOT_PATH)/include/clang/Driver/CC1Options.td \
+    | $(CLANG_TBLGEN) $(TBLGEN)
+	$(call transform-host-td-to-out,opt-parser-defs)
 endif
 
 ifneq ($(findstring CC1AsOptions.inc,$(TBLGEN_TABLES)),)
 LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/Driver/CC1AsOptions.inc
 $(intermediates)/include/clang/Driver/CC1AsOptions.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
-$(intermediates)/include/clang/Driver/CC1AsOptions.inc: $(CLANG_ROOT_PATH)/include/clang/Driver/CC1AsOptions.td $(CLANG_ROOT_PATH)/include/clang/Driver/OptParser.td \
-    | $(CLANG_TBLGEN)
-	$(call transform-host-clang-td-to-out,opt-parser-defs)
+$(intermediates)/include/clang/Driver/CC1AsOptions.inc: $(CLANG_ROOT_PATH)/include/clang/Driver/CC1AsOptions.td $(LLVM_ROOT_PATH)/include/llvm/Option/OptParser.td \
+    | $(CLANG_TBLGEN) $(TBLGEN)
+	$(call transform-host-td-to-out,opt-parser-defs)
 endif
 
 LOCAL_C_INCLUDES += $(intermediates)/include
diff --git a/lib/AST/Android.mk b/lib/AST/Android.mk
index da39b5c05e..c27b9dc997 100644
--- a/lib/AST/Android.mk
+++ b/lib/AST/Android.mk
@@ -30,6 +30,7 @@ clang_ast_SRC_FILES :=	\
 	ASTDiagnostic.cpp	\
 	ASTDumper.cpp	\
 	ASTImporter.cpp	\
+	ASTTypeTraits.cpp \
 	AttrImpl.cpp	\
 	Comment.cpp \
 	CommentBriefParser.cpp \
@@ -57,8 +58,8 @@ clang_ast_SRC_FILES :=	\
 	InheritViz.cpp	\
 	ItaniumCXXABI.cpp	\
 	ItaniumMangle.cpp	\
-	LambdaMangleContext.cpp	\
 	Mangle.cpp	\
+	MangleNumberingContext.cpp \
 	MicrosoftCXXABI.cpp	\
 	MicrosoftMangle.cpp	\
 	NestedNameSpecifier.cpp	\
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index 5bfdea3af1..f75c56c34a 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -51,6 +51,7 @@ clang_codegen_SRC_FILES := \
   CodeGenTypes.cpp \
   ItaniumCXXABI.cpp \
   MicrosoftCXXABI.cpp \
+  MicrosoftVBTables.cpp \
   ModuleBuilder.cpp \
   TargetInfo.cpp
 
diff --git a/lib/Driver/Android.mk b/lib/Driver/Android.mk
index 7a3ec43ac9..c06dd878b9 100644
--- a/lib/Driver/Android.mk
+++ b/lib/Driver/Android.mk
@@ -14,15 +14,11 @@ TBLGEN_TABLES := \
 
 clang_driver_SRC_FILES := \
   Action.cpp \
-  Arg.cpp \
-  ArgList.cpp \
   CC1AsOptions.cpp \
   Compilation.cpp \
   Driver.cpp \
   DriverOptions.cpp \
   Job.cpp \
-  Option.cpp \
-  OptTable.cpp \
   Phases.cpp \
   Tool.cpp \
   ToolChain.cpp \
diff --git a/tools/driver/Android.mk b/tools/driver/Android.mk
index d951081bf6..4062156aa8 100644
--- a/tools/driver/Android.mk
+++ b/tools/driver/Android.mk
@@ -82,6 +82,7 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVMVectorize \
   libLLVMAnalysis \
   libLLVMCore \
+  libLLVMOption \
   libLLVMSupport \
   libLLVMTarget
 
diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index ae76bd13de..4a40dc8543 100644
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -9,7 +9,6 @@ clang_tablegen_SRC_FILES := \
   ClangDiagnosticsEmitter.cpp \
   ClangSACheckersEmitter.cpp \
   NeonEmitter.cpp \
-  OptParserEmitter.cpp \
   TableGen.cpp
 
 include $(CLEAR_VARS)