summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2017-05-31 10:22:30 -0700
committer Adam Lesinski <adamlesinski@google.com> 2017-05-31 10:23:58 -0700
commit41ea44f63d78b03a7c323639f3b80364b65f5a13 (patch)
tree94cc92e0b26c9cfbc08c065a3a39a50ba669513d
parentbacaffa497de1877657f9cb3f59a82e3955f0f75 (diff)
AAPT2: Update --no-version-vector list
Keep in sync with AAPT. Since gradle is moving to use AAPT2 by default, updates to AAPT will no longer be necessary and this will be the authoritative list until a more programmatic solution presents itself. Bug: 62211148 Test: manual Change-Id: Id9232c9fb730c50e4850887fa0f5da82574ca900
-rw-r--r--tools/aapt2/cmd/Link.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index 24a687cd4d86..ebec81b4764c 100644
--- 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>