Add new files for merge to upstream r162325.
Change-Id: I44af8265445bd67d7985164e2e3117b8c3d8d3c1
diff --git a/README.android b/README.android
index bcb286e..32a4ecc 100644
--- a/README.android
+++ b/README.android
@@ -19,8 +19,9 @@
* For Ice Cream Sandwich MR1: Synced to upstream r142531
* For Ice Cream Sandwich MR2: Synced to upstream r146715
* For Jellybean: Synced to upstream r155088
-* For Jellybean: Synced to upstream r160673
+* For Jellybean MR1: Synced to upstream r162325.
+* Recent downstreaming on 2012/8/23: Synced to r162325 (srhines for merge questions)
* Recent downstreaming on 2012/8/3: Synced to r160673 (sliao for merge questions)
* Recent downstreaming on 2012/4/24: Synced to r155088 (sliao for merge questions)
* Recent downstreaming on 2012/3/24: Synced to r153220 (sliao & srhines for merge questions)
diff --git a/lib/AST/Android.mk b/lib/AST/Android.mk
index 685c652..2343b06 100644
--- a/lib/AST/Android.mk
+++ b/lib/AST/Android.mk
@@ -26,6 +26,7 @@
AttrImpl.cpp \
Comment.cpp \
CommentBriefParser.cpp \
+ CommentCommandTraits.cpp \
CommentDumper.cpp \
CommentLexer.cpp \
CommentParser.cpp \
diff --git a/lib/Sema/Android.mk b/lib/Sema/Android.mk
index b835c4f..c7f0e00 100644
--- a/lib/Sema/Android.mk
+++ b/lib/Sema/Android.mk
@@ -55,6 +55,7 @@
SemaOverload.cpp \
SemaPseudoObject.cpp \
SemaStmt.cpp \
+ SemaStmtAsm.cpp \
SemaStmtAttr.cpp \
SemaTemplate.cpp \
SemaTemplateDeduction.cpp \
diff --git a/lib/StaticAnalyzer/Checkers/Android.mk b/lib/StaticAnalyzer/Checkers/Android.mk
index 789f74a..51bcbc2 100644
--- a/lib/StaticAnalyzer/Checkers/Android.mk
+++ b/lib/StaticAnalyzer/Checkers/Android.mk
@@ -37,11 +37,11 @@
DebugCheckers.cpp \
DereferenceChecker.cpp \
DivZeroChecker.cpp \
+ DynamicTypePropagation.cpp \
ExprInspectionChecker.cpp \
FixedAddressChecker.cpp \
GenericTaintChecker.cpp \
IdempotentOperationChecker.cpp \
- IteratorsChecker.cpp \
LLVMConventionsChecker.cpp \
MacOSKeychainAPIChecker.cpp \
MacOSXAPIChecker.cpp \
diff --git a/lib/StaticAnalyzer/Core/Android.mk b/lib/StaticAnalyzer/Core/Android.mk
index 487842f..a226381 100644
--- a/lib/StaticAnalyzer/Core/Android.mk
+++ b/lib/StaticAnalyzer/Core/Android.mk
@@ -16,7 +16,7 @@
BlockCounter.cpp \
BugReporter.cpp \
BugReporterVisitors.cpp \
- Calls.cpp \
+ CallEvent.cpp \
Checker.cpp \
CheckerContext.cpp \
CheckerHelpers.cpp \
