| commit | f296105e22d3c191c014c64a3b8a19421e325267 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 31 20:48:49 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 31 20:49:02 2017 +0000 |
| tree | 4844e3ef508a44e7fe5dba83793192b0de4ad167 | |
| parent | f42c86660d15c50ff7431b89342e590bcc1bed37 [diff] | |
| parent | 41ea44f63d78b03a7c323639f3b80364b65f5a13 [diff] |
Merge "AAPT2: Update --no-version-vector list" into oc-dev
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index dd4b2ba..740a401 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp
@@ -440,7 +440,8 @@ } 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>