Merge "AAPT2: Update --no-version-vector list" into oc-dev

am: f296105e22 Change-Id: I0cde63dfd73b50debdc56f549f7adb1318f05309
2017-05-31 21:15:32 +00:00
parent b5cdbdfcf8 f296105e22
commit ad227a8086
1 changed files with 2 additions and 1 deletions
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -440,7 +440,8 @@ static bool IsTransitionElement(const std::string& name) {
 }

 static bool IsVectorElement(const std::string& name) {
-  return name == "vector" || name == "animated-vector";
+  return name == "vector" || name == "animated-vector" || name == "pathInterpolator" ||
+         name == "objectAnimator";
 }

 template <typename T>